Amend #3043 by allowing a longer hostname and simplifying the code. (#…

…3044)
psi4 · Sep 3, 2023 · 97f4680 · 97f4680
1 parent 81f0da6
commit 97f4680
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/psi4/src/psi4/libciomr/tstart.cc b/psi4/src/psi4/libciomr/tstart.cc
@@ -70,10 +70,10 @@ void PSI_API tstart() {
     const long clk_tck = sysconf(_SC_CLK_TCK);
     times(&total_tmstime);
 
-    // host name has up to HOST_NAME_MAX(==64) + 1 bytes, and must end in the null byte
-    std::vector<char> name(65);
-    error = gethostname(name.data(), 65);
-    if (error != 0) strncpy(name.data(), "nohostname", 11);
+    // host name has up to HOST_NAME_MAX (64 or 256) + 1 bytes, and must end in the null byte
+    std::vector<char> name(257);
+    error = gethostname(name.data(), name.size());
+    if (error) strncpy(name.data(), "nohostname", name.size());
     if (name.back() != '\0') name.push_back('\0');
 
     /// start a global timer
@@ -105,10 +105,10 @@ void PSI_API tstop() {
     struct tms total_tmstime;
     double user_s, sys_s;
 
-    // host name has up to HOST_NAME_MAX(==64) + 1 bytes, and must end in the null byte
-    std::vector<char> name(65);
-    error = gethostname(name.data(), 65);
-    if (error != 0) strncpy(name.data(), "nohostname", 11);
+    // host name has up to HOST_NAME_MAX (64 or 256) + 1 bytes, and must end in the null byte
+    std::vector<char> name(257);
+    error = gethostname(name.data(), name.size());
+    if (error) strncpy(name.data(), "nohostname", name.size());
     if (name.back() != '\0') name.push_back('\0');
 
     time_end = std::time(nullptr);

diff --git a/psi4/src/psi4/libqt/timer.cc b/psi4/src/psi4/libqt/timer.cc
@@ -1006,10 +1006,10 @@ void timer_done() {
     extern Timer_Structure root_timer;
     root_timer.turn_off();
 
-    // host name has up to HOST_NAME_MAX(==64) + 1 bytes, and must end in the null byte
-    std::vector<char> host(65);
-    int error = gethostname(host.data(), 65);
-    if (error != 0) strncpy(host.data(), "nohostname", 11);
+    // host name has up to HOST_NAME_MAX (64 or 256) + 1 bytes, and must end in the null byte
+    std::vector<char> host(257);
+    int error = gethostname(host.data(), host.size());
+    if (error) strncpy(host.data(), "nohostname", host.size());
     if (host.back() != '\0') host.push_back('\0');
 
     /* Dump the timing data to timer.dat and free the timers */