Changeset 2645

Timestamp:

08/02/08 14:29:15 (5 years ago)

Author:

pterjan

Message:

• Move the end of options parsing into handle_command_line

File:

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

neercs/trunk/src/main.c

@@ -80 +80 @@
 {
     struct screen_list *screen_list = NULL;
-    int i, args, s=0;
+    int i, args;
     long long unsigned int last_key_time = 0;
     int mainret = -1;
@@ -95 +95 @@
     }
 
-    if(args==0)
-        args = 1;
-
-
-    s = handle_command_line(argc, argv, screen_list);
-    if(s<0) goto end;
-
-    if(s < argc - 1)
-    {
-        screen_list->to_start = (char**)malloc((argc-s)*sizeof(char*));
-        if(!screen_list->to_start)
-        {
-            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
-            goto end;
-        }
-        for(i=0; i<(argc-1) - s; i++)
-        {
-            screen_list->to_start[i] = strdup(argv[i+s+1]);
-        }
-        screen_list->to_start[argc-1-s] = NULL;
-    }
+    if(handle_command_line(argc, argv, screen_list) < 0)
+        goto end;
 
     /* Read global configuration first */
@@ -130 +111 @@
     {
         char **sockets;
-        if(screen_list->nb_to_grab || (argc-1 > s))
+        if(screen_list->nb_to_grab || screen_list->to_start)
         {
             fprintf(stderr, "-R can not be associated with commands or pids!\n");
@@ -434 +415 @@
 int handle_command_line(int argc, char *argv[], struct screen_list *screen_list)
 {
-    int s = 0;
+    int s = 0, i;
     for(;;)
     {
@@ -524 +505 @@
         }
     }
+    if(s >= 0 && s < argc - 1)
+    {
+        screen_list->to_start = (char**)malloc((argc-s)*sizeof(char*));
+        if(!screen_list->to_start)
+        {
+            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+            return -1;
+        }
+        for(i=0; i<(argc-1) - s; i++)
+        {
+            screen_list->to_start[i] = strdup(argv[i+s+1]);
+        }
+        screen_list->to_start[argc-1-s] = NULL;
+    }
     return s;
 }