Changeset 208

Timestamp:

02/12/08 13:37:54 (9 months ago)

Author:

conrad

Message:

Expand the argument array to handle combined single-letter arguments, eg. so
"xsel -ao" is equivalent to "xsel -a -o".
Patch by Christopher Wellons, adapted to preserve argument order and avoid
potential memory leaks with multiple groups of arguments.

Files:

• xsel/trunk/xsel.c (modified) (3 diffs)

xsel/trunk/xsel.c

@@ -90 +90 @@
-static long timeout = 0;
-static struct itimerval timer;
+
+static int saved_argc;
+static char ** saved_argv;
-
-/*
@@ -1802 +1805 @@
-}
-
+/*
+ * free_saved_argv ()
+ *
+ * atexit function for freeing argv, after it has been relocated to the
+ * heap.
+ */
+static void
+free_saved_argv (void)
+{
+  int i;
+
+  for (i=0; i < saved_argc; i++) {
+    free (saved_argv[i]);
+  }
+  free (saved_argv);
+}
+
+/*
+ * expand_argv (&argc, &argv)
+ *
+ * Explodes single letter options so that the argument parser can see
+ * all of them. Relocates argv and all arguments to the heap.
+ */
+static void 
+expand_argv(int * argc, char **argv[])
+{
+  int i, new_i, arglen, new_argc = *argc;
+  char ** new_argv;
+  char * arg;
+ 
+  /* Calculate new argc */
+  for (i = 0; i < *argc; i++) {
+    arglen = strlen((*argv)[i]);
+    /* An option we need to expand? */
+    if ((arglen > 2) && (*argv)[i][0] == '-' && (*argv)[i][1] != '-')
+      new_argc += arglen-2;
+  }
+
+  /* Allocate new_argv */
+  new_argv = xs_malloc (new_argc * sizeof(char *));
+
+  /* Copy args into new argv */
+  for (i = 0, new_i = 0; i < *argc; i++) {
+    arglen = strlen((*argv)[i]);
+   
+    /* An option we need to expand? */
+    if ((arglen > 2)
+        && (*argv)[i][0] == '-' && (*argv)[i][1] != '-') {
+      /* Make each letter a new argument. */
+
+      char * c = ((*argv)[i] + 1);
+     
+      while (*c != '\0') {
+        arg = xs_malloc(sizeof(char) * 3);
+        arg[0] = '-';
+        arg[1] = *c;
+        arg[2] = '\0';
+        new_argv[new_i++] = arg;
+        c++;
+      }
+    } else {
+      /* Simply copy the argument pointer to new_argv */
+      new_argv[new_i++] = strdup ((*argv)[i]);
+    }
+  }
+
+  /* Set the expected return values */
+  *argc = new_argc;
+  *argv = new_argv;
+
+  /* Save the new argc, argv values and free them on exit */
+  saved_argc = new_argc;
+  saved_argv = new_argv;
+  atexit (free_saved_argv);
+}
-
-/*
@@ -1855 +1933 @@
-
-#define OPT(s) (strcmp (argv[i], (s)) == 0)
+
+  /* Expand argv array before parsing to uncombine arguments. */
+  expand_argv(&argc, &argv);
-
-  /* Parse options; modify behaviour according to user-specified options */