Changeset 857

Timestamp:

Jan 25, 2008 9:00:53 AM (16 years ago)

Author:

dkearney

Message:

added fix for case when USER and HOST env vars do not exist.

File:

• trunk/src/core/RpLibrary.cc (modified) (3 diffs)

trunk/src/core/RpLibrary.cc

@@ -2210 +2210 @@
     std::string timestamp = "";
     std::string username = "";
+    std::string hostname = "";
+    char *user = NULL;
+    char *host = NULL;
 
     if (this->root) {
@@ -2233 +2236 @@
         // how to retrieve username on win32 environment.
         username = "";
+        hostname = "";
 #else
         timestamp.append(timeinfo->tm_zone);
-        username = std::string(getenv("USER"));
+        user = getenv("USER");
+        if (user != NULL) {
+            username = std::string(user);
+        }
+        host = getenv("HOST");
+        if (host != NULL) {
+            hostname = std::string(host);
+        }
 #endif
 
@@ -2242 +2253 @@
         put("output.status",exitStatus);
         put("output.user",username);
+        put("output.host",hostname);
 
         if ( file.is_open() ) {