Changeset 2487 for neercs/trunkTweet

Timestamp:

Jun 24, 2008, 11:14:32 PM (13 years ago)

Author:

Pascal Terjan

Message:

• Add -c/--config to override local config file

File:

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

neercs/trunk/src/main.c

@@ -68 +68 @@
     printf("Example : %s zsh top \n\n", argv[0]);
     printf("Options :\n");
+    printf("\t--config\t\t-c <file>\t\tuse given config file\n");
     printf("\t--pid\t\t-P <pid>\t\tattach <pid>\n");
     printf("\t\t\t-R\t\t\tre-attach another neercs\n");
@@ -102 +103 @@
     if(args==0)
         args = 1;
+
+    /* 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");
+    }
 
     /* Create screen list */
@@ -136 +145 @@
     memset(screen_list->lockpass, 0, 1024);
 
-
-    /* Read global configuration first */
-    read_configuration_file("/etc/neercsrc", screen_list);
-
-    /* Then local one  */
-    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");
-        read_configuration_file(user_path, screen_list);
-        free(user_path);
-    }
-
-
     recurrent_list = (struct recurrent_list*) malloc(sizeof(struct recurrent_list));
     recurrent_list->recurrent = (struct recurrent**) malloc(sizeof(struct recurrent*));
@@ -166 +160 @@
         static struct myoption long_options[] =
             {
+                { "config",      1, NULL, 'c' },
 #if defined USE_GRAB
                 { "pid",         1, NULL, 'P' },
@@ -173 +168 @@
             };
 #if defined USE_GRAB
-        int c = mygetopt(argc, argv, "RP:hv", long_options, &option_index);
+        int c = mygetopt(argc, argv, "c:RP:hv", long_options, &option_index);
 #else
-        int c = mygetopt(argc, argv, "Rhv", long_options, &option_index);
+        int c = mygetopt(argc, argv, "c:Rhv", long_options, &option_index);
 #endif
         if(c == -1)
@@ -182 +177 @@
         switch(c)
         {
+        case 'c': /* --config */
+            if(user_path)
+                free(user_path);
+            user_path = strdup(myoptarg);
+            s+=2;
+            break;
         case 'P': /* --pid */
             pidopt = atoi(myoptarg);
@@ -221 +222 @@
             break;
         }
+    }
+
+    /* Read global configuration first */
+    read_configuration_file("/etc/neercsrc", screen_list);
+
+    /* Then local one  */
+    if(user_path)
+    {
+        read_configuration_file(user_path, screen_list);
+        free(user_path);
     }