Changeset d3941a0

Timestamp:

Feb 4, 2011, 3:49:44 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

65c753e

Parents:

b03c714

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 17:14:08)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

Use g_strjoinv in owl_global_set_startupargs

It's much nicer than dealing with string lengths, although it does mean
we lose const-correctness because glib just gives up on that with lists
of strings. Also make a copy of the argument list because getopt_long
messes around with argument lists anyway.

Files:

• global.c (modified) (1 diff)
• owl.c (modified) (3 diffs)

global.c

@@ -527 +527 @@
 /* startup args */
 
-void owl_global_set_startupargs(owl_global *g, int argc, const char *const *argv) {
-  int i, len;
-
+void owl_global_set_startupargs(owl_global *g, int argc, char **argv) {
   if (g->startupargs) owl_free(g->startupargs);
-  
-  len=0;
-  for (i=0; i<argc; i++) {
-    len+=strlen(argv[i])+5;
-  }
-  g->startupargs=owl_malloc(len+5);
-
-  strcpy(g->startupargs, "");
-  for (i=0; i<argc; i++) {
-    sprintf(g->startupargs + strlen(g->startupargs), "%s ", argv[i]);
-  }
-  g->startupargs[strlen(g->startupargs)-1]='\0';
+  g->startupargs = g_strjoinv(" ", argv);
 }
 

owl.c

@@ -454 +454 @@
 int main(int argc, char **argv, char **env)
 {
-  int argcsave;
-  const char *const *argvsave;
+  int argc_copy;
+  char **argv_copy;
   char *perlout, *perlerr;
   const owl_style *s;
@@ -464 +464 @@
     g_error ("GLib version 2.12.0 or above is needed.");
 
-  argcsave=argc;
-  argvsave=strs(argv);
+  argc_copy = argc;
+  argv_copy = g_strdupv(argv);
 
   setlocale(LC_ALL, "");
@@ -483 +483 @@
   if (opts.confdir) owl_global_set_confdir(&g, opts.confdir);
   owl_function_debugmsg("startup: first available debugging message");
-  owl_global_set_startupargs(&g, argcsave, argvsave);
+  owl_global_set_startupargs(&g, argc_copy, argv_copy);
+  g_strfreev(argv_copy);
   owl_global_set_haveaim(&g);