[Toxine-cvs] CVS: toxine/src main.c,1.28,1.29

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20464

Modified Files:
	main.c 
Log Message:
@@always set tox->argv[0]


Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- main.c	16 May 2004 20:28:40 -0000	1.28
+++ main.c	16 May 2004 20:35:11 -0000	1.29
@@ -155,14 +155,17 @@
  *
  */
 static void toxine_get_extra_argv(toxine_t *tox, int argc, char *argv[], char *argv_zero) {
-  int  i;
+  int  i = 0;
   
-  tox->argc     = argc + 1;
-  tox->argv     = (char **) xine_xmalloc(sizeof(char *) * (argc + 2));
-  tox->argv[0]  = strdup(argv_zero);
-
-  for(i = 1; i < tox->argc; i++)
-    tox->argv[i] = strdup(argv[i - 1]);
+  tox->argc      = argc + 1;
+  tox->argv      = (char **) xine_xmalloc(sizeof(char *) * (argc + 2));
+  tox->argv[i++] = strdup(argv_zero);
+  
+  if((argc - optind)) {
+    for(; i < tox->argc; i++)
+      tox->argv[i] = strdup(argv[i - 1]);
+  }
+  tox->argv[i] = NULL;
 }
 
 
@@ -291,8 +294,7 @@
 
   toxine_show_version();
 
-  if(argc - optind)
-    toxine_get_extra_argv(tox, argc - optind, &argv[optind], argv[0]);
+  toxine_get_extra_argv(tox, argc - optind, &argv[optind], argv[0]);
 
   /*
    * generate and init a config "object"