Changeset 2497 for neercs/trunkTweet

Timestamp:

Jun 28, 2008, 1:39:10 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Use $HOME before trying to get user directory via getpwuid

File:

• neercs/trunk/src/main.c (modified) (6 diffs)

neercs/trunk/src/main.c

@@ -81 +81 @@
     struct screen_list *screen_list = NULL;
     struct passwd *user_info;
-    char *user_path = NULL, *session_name = NULL;
+    char *user_path = NULL, *user_dir = NULL, *session_name = NULL;
     int i, args, s=0;
     int eof = 0, refresh = 1, command = 0;
@@ -104 +104 @@
 
     /* Build local config file path */
-    user_info = getpwuid(getuid());
-    if(user_info)
-    {
-        user_path = malloc(strlen(user_info->pw_dir) + strlen("/.neercsrc") + 1);
-        sprintf(user_path, "%s/%s", user_info->pw_dir, ".neercsrc");
-    }
-
-
+    user_dir = getenv("HOME");
+    if(!user_dir)
+    {
+        user_info = getpwuid(getuid());
+        if(user_info)
+        {
+            user_dir = user_info->pw_dir;
+        }
+    }
+    if(user_dir)
+    {
+        user_path = malloc(strlen(user_dir) + strlen("/.neercsrc") + 1);
+        sprintf(user_path, "%s/%s", user_dir, ".neercsrc");
+    }
 
     screen_list->recurrent_list = (struct recurrent_list*) malloc(sizeof(struct recurrent_list));
@@ -445 +451 @@
     if(screen_list->dp)
         caca_free_display(screen_list->dp);
+
     cucul_free_canvas(screen_list->cv);
+
     for(i = 0; i < screen_list->count; i++)
     {
@@ -455 +463 @@
         free(screen_list->socket_path);
     }
+
     if(screen_list->socket)
         close(screen_list->socket);
@@ -462 +471 @@
 
     struct option *option = screen_list->config;
-
 
     while(option)
@@ -470 +478 @@
         if(kromeugnon->key)   free(kromeugnon->key);
         if(kromeugnon->value) free(kromeugnon->value);
-        if(kromeugnon)        free(kromeugnon);
-    }
-
+        free(kromeugnon);
+    }
 
     for(i=0; i<screen_list->recurrent_list->count; i++)