struct argv overhaul

412 lines not on this page · raw message

76 lines not on this page · raw message

465 lines not on this page · raw message

66 lines not on this page · raw message

194 lines not on this page · raw message

index 60534ac..89c9b14 100644
@@ -39,7 +39,7 @@
 #include "argv.h"
 #include "options.h"
 
-void
+static void
 argv_init (struct argv *a)
 {
   a->capacity = 0;

@@ -157,12 +157,6 @@ argv_extract_cmd_name (const char *path)
   return ret;
 }
 
-const char *
-argv_system_str (const struct argv *a)
-{
-  return a->system_str;
-}
-
 static struct argv
 argv_clone (const struct argv *a, const size_t headroom)
 {

@@ -199,7 +193,7 @@ argv_insert_head (const struct argv *a, const char *head)
   return r;
 }
 
-char *
+static char *
 argv_term (const char **f)
 {
   const char *p = *f;

@@ -272,33 +266,13 @@ argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix)
   gc_free (&gc);
 }
 
-void
-argv_printf (struct argv *a, const char *format, ...)
-{
-  va_list arglist;
-  va_start (arglist, format);
-  argv_printf_arglist (a, format, 0, arglist);
-  va_end (arglist);
- }
-
-void
-argv_printf_cat (struct argv *a, const char *format, ...)
-{
-  va_list arglist;
-  va_start (arglist, format);
-  argv_printf_arglist (a, format, APA_CAT, arglist);
-  va_end (arglist);
-}
-
-void
-argv_printf_arglist (struct argv *a, const char *format, const unsigned int flags, va_list arglist)
+static void
+argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
 {
   struct gc_arena gc = gc_new ();
   char *term;
   const char *f = format;
 
-  if (!(flags & APA_CAT))
-    argv_reset (a);
   argv_extend (a, 1); /* ensure trailing NULL */
 
   while ((term = argv_term (&f)) != NULL)

@@ -410,3 +384,22 @@ argv_printf_arglist (struct argv *a, const char *format, const unsigned int flag
   gc_free (&gc);
 }
 
+void
+argv_printf (struct argv *a, const char *format, ...)
+{
+  va_list arglist;
+  argv_reset (a);
+  va_start (arglist, format);
+  argv_printf_arglist (a, format, arglist);
+  va_end (arglist);
+ }
+
+void
+argv_printf_cat (struct argv *a, const char *format, ...)
+{
+  va_list arglist;
+  va_start (arglist, format);
+  argv_printf_arglist (a, format, arglist);
+  va_end (arglist);
+}
+

index df658a0..5f8e21c 100644
@@ -40,18 +40,12 @@ struct argv {
   char *system_str;
 };
 
-void argv_init (struct argv *a);
 struct argv argv_new (void);
 void argv_reset (struct argv *a);
-char *argv_term (const char **f);
 const char *argv_str (const struct argv *a, struct gc_arena *gc, const unsigned int flags);
 struct argv argv_insert_head (const struct argv *a, const char *head);
 void argv_msg (const int msglev, const struct argv *a);
 void argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix);
-const char *argv_system_str (const struct argv *a);
-
-#define APA_CAT (1<<0) /* concatentate onto existing struct argv list */
-void argv_printf_arglist (struct argv *a, const char *format, const unsigned int flags, va_list arglist);
 
 void argv_printf (struct argv *a, const char *format, ...)
 #ifdef __GNUC__

index 9cd7575..8a953c9 100644
@@ -60,9 +60,8 @@ get_console_input_systemd (const char *prompt, const bool echo, char *input, con
 {
     int std_out;
     bool ret = false;
-    struct argv argv;
+    struct argv argv = argv_new ();
 
-    argv_init (&argv);
     argv_printf (&argv, SYSTEMD_ASK_PASSWORD_PATH);
 #ifdef SYSTEMD_NEWER_THAN_216
     /* the --echo support arrived in upstream systemd 217 */

index 96d4e11..98bb228 100644
@@ -1395,7 +1395,7 @@ add_route (struct route_ipv4 *r,
 	   const struct env_set *es)
 {
   struct gc_arena gc;
-  struct argv argv;
+  struct argv argv = argv_new ();
   const char *network;
   const char *netmask;
   const char *gateway;

@@ -1406,7 +1406,6 @@ add_route (struct route_ipv4 *r,
     return;
 
   gc_init (&gc);
-  argv_init (&argv);
 
   network = print_in_addr_t (r->network, 0, &gc);
   netmask = print_in_addr_t (r->netmask, 0, &gc);

@@ -1671,7 +1670,7 @@ void
 add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flags, const struct env_set *es)
 {
   struct gc_arena gc;
-  struct argv argv;
+  struct argv argv = argv_new ();
 
   const char *network;
   const char *gateway;

@@ -1693,7 +1692,6 @@ add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int fla
 #endif
 
   gc_init (&gc);
-  argv_init (&argv);
 
   route_ipv6_clear_host_bits (r6);
 

@@ -1933,7 +1931,7 @@ delete_route (struct route_ipv4 *r,
 	      const struct env_set *es)
 {
   struct gc_arena gc;
-  struct argv argv;
+  struct argv argv = argv_new ();
   const char *network;
   const char *netmask;
   const char *gateway;

@@ -1943,7 +1941,6 @@ delete_route (struct route_ipv4 *r,
     return;
 
   gc_init (&gc);
-  argv_init (&argv);
 
   network = print_in_addr_t (r->network, 0, &gc);
   netmask = print_in_addr_t (r->netmask, 0, &gc);

@@ -2108,7 +2105,7 @@ void
 delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flags, const struct env_set *es)
 {
   struct gc_arena gc;
-  struct argv argv;
+  struct argv argv = argv_new ();
   const char *network;
   const char *gateway;
   const char *device = tt->actual_name;

@@ -2126,7 +2123,6 @@ delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigne
 #endif
 
   gc_init (&gc);
-  argv_init (&argv);
 
   network = print_in6_addr( r6->network, 0, &gc);
   gateway = print_in6_addr( r6->gateway, 0, &gc);

152 lines not on this page · raw message

index 89c9b14..a279a40 100644
@@ -45,7 +45,6 @@ argv_init (struct argv *a)
   a->capacity = 0;
   a->argc = 0;
   a->argv = NULL;
-  a->system_str = NULL;
 }
 
 struct argv

@@ -63,7 +62,6 @@ argv_reset (struct argv *a)
   for (i = 0; i < a->argc; ++i)
     free (a->argv[i]);
   free (a->argv);
-  free (a->system_str);
   argv_init (a);
 }
 

@@ -98,65 +96,6 @@ argv_append (struct argv *a, char *str) /* str must have been malloced or be NUL
   a->argv[a->argc++] = str;
 }
 
-static void
-argv_system_str_append (struct argv *a, const char *str, const bool enquote)
-{
-  if (str)
-    {
-      char *newstr;
-
-      /* compute length of new system_str */
-      size_t l = strlen (str) + 1; /* space for new string plus trailing '\0' */
-      if (a->system_str)
-        l += strlen (a->system_str) + 1; /* space for existing string + space (" ") separator */
-      if (enquote)
-        l += 2; /* space for two quotes */
-
-      /* build new system_str */
-      newstr = (char *) malloc (l);
-      newstr[0] = '\0';
-      check_malloc_return (newstr);
-      if (a->system_str)
-        {
-          strcpy (newstr, a->system_str);
-          strcat (newstr, " ");
-        }
-      if (enquote)
-        strcat (newstr, "\"");
-      strcat (newstr, str);
-      if (enquote)
-        strcat (newstr, "\"");
-      free (a->system_str);
-      a->system_str = newstr;
-    }
-}
-
-static char *
-argv_extract_cmd_name (const char *path)
-{
-  char *ret = NULL;
-  if (path)
-    {
-      char *path_cp = string_alloc(path, NULL); /* POSIX basename() implementaions may modify its arguments */
-      const char *bn = basename (path_cp);
-      if (bn)
-        {
-          char *dot = NULL;
-          ret = string_alloc (bn, NULL);
-          dot = strrchr (ret, '.');
-          if (dot)
-            *dot = '\0';
-          free(path_cp);
-          if (ret[0] == '\0')
-            {
-              free(ret);
-              ret = NULL;
-            }
-        }
-    }
-  return ret;
-}
-
 static struct argv
 argv_clone (const struct argv *a, const size_t headroom)
 {

@@ -170,7 +109,6 @@ argv_clone (const struct argv *a, const size_t headroom)
     {
       for (i = 0; i < a->argc; ++i)
         argv_append (&r, string_alloc (a->argv[i], NULL));
-      r.system_str = string_alloc (a->system_str, NULL);
     }
   return r;
 }

@@ -179,17 +117,8 @@ struct argv
 argv_insert_head (const struct argv *a, const char *head)
 {
   struct argv r;
-  char *s;
-
   r = argv_clone (a, 1);
   r.argv[0] = string_alloc (head, NULL);
-  s = r.system_str;
-  r.system_str = string_alloc (head, NULL);
-  if (s)
-    {
-      argv_system_str_append (&r, s, false);
-      free (s);
-    }
   return r;
 }
 

@@ -285,7 +214,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
               if (!s)
                 s = "";
               argv_append (a, string_alloc (s, NULL));
-              argv_system_str_append (a, s, true);
             }
           else if (!strcmp (term, "%sc"))
             {

@@ -304,13 +232,10 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
                     }
                   else
                     argv_append (a, string_alloc (s, NULL));
-
-                  argv_system_str_append (a, s, false);
                 }
               else
                 {
                   argv_append (a, string_alloc ("", NULL));
-                  argv_system_str_append (a, "echo", false);
                 }
             }
           else if (!strcmp (term, "%d"))

@@ -318,14 +243,12 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
               char numstr[64];
               openvpn_snprintf (numstr, sizeof (numstr), "%d", va_arg (arglist, int));
               argv_append (a, string_alloc (numstr, NULL));
-              argv_system_str_append (a, numstr, false);
             }
           else if (!strcmp (term, "%u"))
             {
               char numstr[64];
               openvpn_snprintf (numstr, sizeof (numstr), "%u", va_arg (arglist, unsigned int));
               argv_append (a, string_alloc (numstr, NULL));
-              argv_system_str_append (a, numstr, false);
             }
           else if (!strcmp (term, "%s/%d"))
             {

@@ -346,7 +269,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
                 strcat (combined, "/");
                 strcat (combined, numstr);
                 argv_append (a, combined);
-                argv_system_str_append (a, combined, false);
               }
             }
           else if (!strcmp (term, "%s%sc"))

@@ -363,13 +285,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
               strcpy (combined, s1);
               strcat (combined, s2);
               argv_append (a, combined);
-
-              cmd_name = argv_extract_cmd_name (combined);
-              if (cmd_name)
-                {
-                  argv_system_str_append (a, cmd_name, false);
-                  free (cmd_name);
-                }
             }
           else
             ASSERT (0);

@@ -378,7 +293,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
       else
         {
           argv_append (a, term);
-          argv_system_str_append (a, term, false);
         }
     }
   gc_free (&gc);

index 5f8e21c..c45bec8 100644
@@ -37,7 +37,6 @@ struct argv {
   size_t capacity;
   size_t argc;
   char **argv;
-  char *system_str;
 };
 
 struct argv argv_new (void);

index a279a40..f8287b7 100644
@@ -198,7 +198,6 @@ argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix)
 static void
 argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
 {
-  struct gc_arena gc = gc_new ();
   char *term;
   const char *f = format;
 

@@ -215,29 +214,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
                 s = "";
               argv_append (a, string_alloc (s, NULL));
             }
-          else if (!strcmp (term, "%sc"))
-            {
-              char *s = va_arg (arglist, char *);
-              if (s)
-                {
-                  int nparms;
-                  char *parms[MAX_PARMS+1];
-                  int i;
-
-                  nparms = parse_line (s, parms, MAX_PARMS, "SCRIPT-ARGV", 0, D_ARGV_PARSE_CMD, &gc);
-                  if (nparms)
-                    {
-                      for (i = 0; i < nparms; ++i)
-                        argv_append (a, string_alloc (parms[i], NULL));
-                    }
-                  else
-                    argv_append (a, string_alloc (s, NULL));
-                }
-              else
-                {
-                  argv_append (a, string_alloc ("", NULL));
-                }
-            }
           else if (!strcmp (term, "%d"))
             {
               char numstr[64];

@@ -295,7 +271,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
           argv_append (a, term);
         }
     }
-  gc_free (&gc);
 }
 
 void

@@ -317,3 +292,25 @@ argv_printf_cat (struct argv *a, const char *format, ...)
   va_end (arglist);
 }
 
+void
+argv_parse_cmd (struct argv *a, const char *s)
+{
+  int nparms;
+  char *parms[MAX_PARMS + 1];
+  struct gc_arena gc = gc_new ();
+
+  argv_reset (a);
+  argv_extend (a, 1); /* ensure trailing NULL */
+
+  nparms = parse_line (s, parms, MAX_PARMS, "SCRIPT-ARGV", 0, D_ARGV_PARSE_CMD, &gc);
+  if (nparms)
+    {
+      int i;
+      for (i = 0; i < nparms; ++i)
+        argv_append (a, string_alloc (parms[i], NULL));
+    }
+  else
+    argv_append (a, string_alloc (s, NULL));
+
+  gc_free (&gc);
+}

index c45bec8..9aee641 100644
@@ -45,6 +45,7 @@ const char *argv_str (const struct argv *a, struct gc_arena *gc, const unsigned
 struct argv argv_insert_head (const struct argv *a, const char *head);
 void argv_msg (const int msglev, const struct argv *a);
 void argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix);
+void argv_parse_cmd (struct argv *a, const char *s);
 
 void argv_printf (struct argv *a, const char *format, ...)
 #ifdef __GNUC__

index ae1f8f4..9d56eb4 100644
@@ -142,7 +142,7 @@
 #define D_PS_PROXY_DEBUG     LOGLEV(7, 70, M_DEBUG)  /* port share proxy debug */
 #define D_AUTO_USERID        LOGLEV(7, 70, M_DEBUG)  /* AUTO_USERID debugging */
 #define D_TLS_KEYSELECT      LOGLEV(7, 70, M_DEBUG)  /* show information on key selection for data channel */
-#define D_ARGV_PARSE_CMD     LOGLEV(7, 70, M_DEBUG)  /* show parse_line() errors in argv_printf %sc */
+#define D_ARGV_PARSE_CMD     LOGLEV(7, 70, M_DEBUG)  /* show parse_line() errors in argv_parse_cmd */
 #define D_CRYPTO_DEBUG       LOGLEV(7, 70, M_DEBUG)  /* show detailed info from crypto.c routines */
 #define D_PID_DEBUG          LOGLEV(7, 70, M_DEBUG)  /* show packet-id debugging info */
 #define D_PF_DROPPED_BCAST   LOGLEV(7, 71, M_DEBUG)  /* packet filter dropped a broadcast packet */

index 73f8c6d..56140b3 100644
@@ -1362,7 +1362,7 @@ do_route (const struct options *options,
     {
       struct argv argv = argv_new ();
       setenv_str (es, "script_type", "route-up");
-      argv_printf (&argv, "%sc", options->route_script);
+      argv_parse_cmd (&argv, options->route_script);
       openvpn_run_script (&argv, es, 0, "--route-up");
       argv_reset (&argv);
     }

index af362e9..b433df6 100644
@@ -120,13 +120,9 @@ run_up_down (const char *command,
       struct argv argv = argv_new ();
       ASSERT (arg);
       setenv_str (es, "script_type", script_type);
-      argv_printf (&argv,
-		  "%sc %s %d %d %s %s %s",
-		  command,
-		  arg,
-		  tun_mtu, link_mtu,
-		  ifconfig_local, ifconfig_remote,
-		  context);
+      argv_parse_cmd (&argv, command);
+      argv_printf_cat (&argv, "%s %d %d %s %s %s", arg, tun_mtu, link_mtu,
+                       ifconfig_local, ifconfig_remote, context);
       argv_msg (M_INFO, &argv);
       openvpn_run_script (&argv, es, S_FATAL, "--up/--down");
       argv_reset (&argv);

index 93a554d..9c75f7b 100644
@@ -126,10 +126,8 @@ learn_address_script (const struct multi_context *m,
     {
       struct argv argv = argv_new ();
       setenv_str (es, "script_type", "learn-address");
-      argv_printf (&argv, "%sc %s %s",
-		   m->top.options.learn_address_script,
-		   op,
-		   mroute_addr_print (addr, &gc));
+      argv_parse_cmd (&argv, m->top.options.learn_address_script);
+      argv_printf_cat (&argv, "%s %s", op, mroute_addr_print (addr, &gc));
       if (mi)
 	argv_printf_cat (&argv, "%s", tls_common_name (mi->context.c2.tls_multi, false));
       if (!openvpn_run_script (&argv, es, 0, "--learn-address"))

@@ -545,7 +543,7 @@ multi_client_disconnect_script (struct multi_context *m,
 	{
 	  struct argv argv = argv_new ();
 	  setenv_str (mi->context.c2.es, "script_type", "client-disconnect");
-	  argv_printf (&argv, "%sc", mi->context.options.client_disconnect_script);
+	  argv_parse_cmd (&argv, mi->context.options.client_disconnect_script);
 	  openvpn_run_script (&argv, mi->context.c2.es, 0, "--client-disconnect");
 	  argv_reset (&argv);
 	}

@@ -1834,9 +1832,8 @@ multi_connection_established (struct multi_context *m, struct multi_instance *mi
             goto script_failed;
           }
 
-	  argv_printf (&argv, "%sc %s",
-		       mi->context.options.client_connect_script,
-		       dc_file);
+          argv_parse_cmd (&argv, mi->context.options.client_connect_script);
+          argv_printf_cat (&argv, "%s", dc_file);
 
 	  if (openvpn_run_script (&argv, mi->context.c2.es, 0, "--client-connect"))
 	    {

index 996c26e..557299a 100644
@@ -2778,7 +2778,7 @@ check_cmd_access(const char *command, const char *opt, const char *chroot)
 
   /* Extract executable path and arguments */
   argv = argv_new ();
-  argv_printf (&argv, "%sc", command);
+  argv_parse_cmd (&argv, command);
 
   /* if an executable is specified then check it; otherwise, complain */
   if (argv.argv[0])

index 184c7ad..bb7cba1 100644
@@ -2022,9 +2022,10 @@ ipchange_fmt (const bool include_cmd, struct argv *argv, const struct link_socke
 {
   const char *host = print_sockaddr_ex (&info->lsa->actual.dest.addr.sa, " ", PS_SHOW_PORT , gc);
   if (include_cmd)
-    argv_printf (argv, "%sc %s",
-		 info->ipchange_command,
-		 host);
+    {
+      argv_parse_cmd (argv, info->ipchange_command);
+      argv_printf_cat (argv, "%s", host);
+    }
   else
     argv_printf (argv, "%s", host);
 

index d0c22b8..be9f224 100644
@@ -514,7 +514,8 @@ verify_cert_call_command(const char *verify_command, struct env_set *es,
        }
     }
 
-  argv_printf (&argv, "%sc %d %s", verify_command, cert_depth, subject);
+  argv_parse_cmd (&argv, verify_command);
+  argv_printf_cat (&argv, "%d %s", cert_depth, subject);
 
   argv_msg_prefix (D_TLS_DEBUG, &argv, "TLS: executing verify command");
   ret = openvpn_run_script (&argv, es, 0, "--tls-verify script");

@@ -981,7 +982,8 @@ verify_user_pass_script (struct tls_session *session, const struct user_pass *up
       setenv_untrusted (session);
 
       /* format command line */
-      argv_printf (&argv, "%sc %s", session->opt->auth_user_pass_verify_script, tmp_file);
+      argv_parse_cmd (&argv, session->opt->auth_user_pass_verify_script);
+      argv_printf_cat (&argv, "%s", tmp_file);
 
       /* call command */
       ret = openvpn_run_script (&argv, session->opt->es, 0,

index f07a5fb..3945634 100644
@@ -99,14 +99,23 @@ argv_printf__combined_path_with_spaces__argc_correct (void **state)
 }
 
 static void
-argv_printf__script_command__argc_correct (void **state)
+argv_parse_cmd__command_string__argc_correct (void **state)
 {
   struct argv a = argv_new ();
 
-  argv_printf (&a, "%sc", SCRIPT_CMD);
+  argv_parse_cmd (&a, SCRIPT_CMD);
   assert_int_equal (a.argc, 3);
 
-  argv_printf (&a, "bar baz %sc %d %s", SCRIPT_CMD, 42, PATH1);
+  argv_reset (&a);
+}
+
+static void
+argv_parse_cmd__command_and_extra_options__argc_correct (void **state)
+{
+  struct argv a = argv_new ();
+
+  argv_parse_cmd (&a, SCRIPT_CMD);
+  argv_printf_cat (&a, "bar baz %d %s", 42, PATH1);
   assert_int_equal (a.argc, 7);
 
   argv_reset (&a);

@@ -184,7 +193,8 @@ main(void)
     cmocka_unit_test (argv_printf__multiple_spaces_in_format__parsed_as_one),
     cmocka_unit_test (argv_printf_cat__multiple_spaces_in_format__parsed_as_one),
     cmocka_unit_test (argv_printf__combined_path_with_spaces__argc_correct),
-    cmocka_unit_test (argv_printf__script_command__argc_correct),
+    cmocka_unit_test (argv_parse_cmd__command_string__argc_correct),
+    cmocka_unit_test (argv_parse_cmd__command_and_extra_options__argc_correct),
     cmocka_unit_test (argv_printf_cat__used_twice__argc_correct),
     cmocka_unit_test (argv_str__multiple_argv__correct_output),
     cmocka_unit_test (argv_insert_head__non_empty_argv__head_added),

index f8287b7..dcfbd76 100644
@@ -6,6 +6,7 @@
  *             packet compression.
  *
  *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <[email protected]...>
+ *                2016      Heiko Hund <[email protected]...>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2

@@ -122,54 +123,6 @@ argv_insert_head (const struct argv *a, const char *head)
   return r;
 }
 
-static char *
-argv_term (const char **f)
-{
-  const char *p = *f;
-  const char *term = NULL;
-  size_t termlen = 0;
-
-  if (*p == '\0')
-    return NULL;
-
-  while (true)
-    {
-      const int c = *p;
-      if (c == '\0')
-        break;
-      if (term)
-        {
-          if (!isspace (c))
-            ++termlen;
-          else
-            break;
-        }
-      else
-        {
-          if (!isspace (c))
-            {
-              term = p;
-              termlen = 1;
-            }
-        }
-      ++p;
-    }
-  *f = p;
-
-  if (term)
-    {
-      char *ret;
-      ASSERT (termlen > 0);
-      ret = malloc (termlen + 1);
-      check_malloc_return (ret);
-      memcpy (ret, term, termlen);
-      ret[termlen] = '\0';
-      return ret;
-    }
-  else
-    return NULL;
-}
-
 const char *
 argv_str (const struct argv *a, struct gc_arena *gc, const unsigned int flags)
 {

@@ -195,101 +148,111 @@ argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix)
   gc_free (&gc);
 }
 
-static void
-argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
+static char *
+argv_prep_format (const char *format, const char delim, size_t *count, struct gc_arena *gc)
 {
-  char *term;
-  const char *f = format;
+  int i, j;
+  char *f;
+  bool in_token = false;
 
-  argv_extend (a, 1); /* ensure trailing NULL */
+  if (format == NULL)
+    return NULL;
 
-  while ((term = argv_term (&f)) != NULL)
+  f = gc_malloc (strlen (format) + 1, true, gc);
+  for (i = 0, j = 0; i < strlen (format); i++)
     {
-      if (term[0] == '%')
+      if (format[i] == ' ')
         {
-          if (!strcmp (term, "%s"))
-            {
-              char *s = va_arg (arglist, char *);
-              if (!s)
-                s = "";
-              argv_append (a, string_alloc (s, NULL));
-            }
-          else if (!strcmp (term, "%d"))
-            {
-              char numstr[64];
-              openvpn_snprintf (numstr, sizeof (numstr), "%d", va_arg (arglist, int));
-              argv_append (a, string_alloc (numstr, NULL));
-            }
-          else if (!strcmp (term, "%u"))
-            {
-              char numstr[64];
-              openvpn_snprintf (numstr, sizeof (numstr), "%u", va_arg (arglist, unsigned int));
-              argv_append (a, string_alloc (numstr, NULL));
-            }
-          else if (!strcmp (term, "%s/%d"))
-            {
-              char numstr[64];
-              char *s = va_arg (arglist, char *);
-
-              if (!s)
-                s = "";
-
-              openvpn_snprintf (numstr, sizeof (numstr), "%d", va_arg (arglist, int));
-
-              {
-                const size_t len = strlen(s) + strlen(numstr) + 2;
-                char *combined = (char *) malloc (len);
-                check_malloc_return (combined);
-
-                strcpy (combined, s);
-                strcat (combined, "/");
-                strcat (combined, numstr);
-                argv_append (a, combined);
-              }
-            }
-          else if (!strcmp (term, "%s%sc"))
-            {
-              char *s1 = va_arg (arglist, char *);
-              char *s2 = va_arg (arglist, char *);
-              char *combined;
-              char *cmd_name;
-
-              if (!s1) s1 = "";
-              if (!s2) s2 = "";
-              combined = (char *) malloc (strlen(s1) + strlen(s2) + 1);
-              check_malloc_return (combined);
-              strcpy (combined, s1);
-              strcat (combined, s2);
-              argv_append (a, combined);
-            }
-          else
-            ASSERT (0);
-          free (term);
+          in_token = false;
+          continue;
         }
-      else
+
+      if (!in_token)
         {
-          argv_append (a, term);
+          ++*count;
+          if (f[0])
+            f[j++] = delim;
         }
+
+      f[j++] = format[i];
+      in_token = true;
     }
+  return f;
 }
 
-void
+static bool
+argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
+{
+  struct gc_arena gc = gc_new ();
+  const char *delim = "\035";
+  char *f, *buf, *token;
+  size_t argc, size;
+  bool res = false;
+  va_list tmplist;
+  int len;
+
+  argv_extend (a, 1); /* ensure trailing NULL */
+
+  argc = a->argc;
+  f = argv_prep_format (format, delim[0], &argc, &gc);
+  if (f == NULL)
+    goto out;
+
+  va_copy (tmplist, arglist);
+  len = vsnprintf (NULL, 0, f, tmplist);
+  va_end (tmplist);
+  if (len < 0)
+    goto out;
+
+  size = adjust_power_of_2 (len + 1);
+  buf = gc_malloc (size, false, &gc);
+  len = vsnprintf (buf, size, f, arglist);
+  if (len < 0 || len >= size)
+    goto out;
+
+  token = strtok (buf, delim);
+  while (token)
+    {
+      argv_append (a, string_alloc (token, NULL));
+      token = strtok (NULL, delim);
+    }
+
+  if (a->argc != argc)
+    {
+      /* Someone snuck in a \035, fail gracefully */
+      argv_reset (a);
+      argv_extend (a, 1); /* ensure trailing NULL */
+      goto out;
+    }
+
+  res = true;
+
+out:
+  gc_free (&gc);
+  return res;
+}
+
+bool
 argv_printf (struct argv *a, const char *format, ...)
 {
+  bool res;
   va_list arglist;
-  argv_reset (a);
   va_start (arglist, format);
-  argv_printf_arglist (a, format, arglist);
+  argv_reset (a);
+  res = argv_printf_arglist (a, format, arglist);
   va_end (arglist);
+  return res;
  }
 
-void
+bool
 argv_printf_cat (struct argv *a, const char *format, ...)
 {
+  bool res;
   va_list arglist;
   va_start (arglist, format);
-  argv_printf_arglist (a, format, arglist);
+  res = argv_printf_arglist (a, format, arglist);
   va_end (arglist);
+  return res;
 }
 
 void

index 9aee641..ff3933e 100644
@@ -47,7 +47,7 @@ void argv_msg (const int msglev, const struct argv *a);
 void argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix);
 void argv_parse_cmd (struct argv *a, const char *s);
 
-void argv_printf (struct argv *a, const char *format, ...)
+bool argv_printf (struct argv *a, const char *format, ...)
 #ifdef __GNUC__
 #if __USE_MINGW_ANSI_STDIO
         __attribute__ ((format (gnu_printf, 2, 3)))

@@ -57,7 +57,7 @@ void argv_printf (struct argv *a, const char *format, ...)
 #endif
   ;
 
-void argv_printf_cat (struct argv *a, const char *format, ...)
+bool argv_printf_cat (struct argv *a, const char *format, ...)
 #ifdef __GNUC__
 #if __USE_MINGW_ANSI_STDIO
         __attribute__ ((format (gnu_printf, 2, 3)))

index 98bb228..ca1e0a7 100644
@@ -1457,7 +1457,7 @@ add_route (struct route_ipv4 *r,
 #elif defined (WIN32)
   {
     DWORD ai = TUN_ADAPTER_INDEX_INVALID;
-    argv_printf (&argv, "%s%sc ADD %s MASK %s %s",
+    argv_printf (&argv, "%s%s ADD %s MASK %s %s",
 		 get_win_sys_path(),
 		 WIN_ROUTE_PATH_SUFFIX,
 		 network,

@@ -1796,7 +1796,7 @@ add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int fla
       device = buf_bptr(&out);
 
       /* netsh interface ipv6 add route 2001:db8::/32 MyTunDevice */
-      argv_printf (&argv, "%s%sc interface ipv6 add route %s/%d %s",
+      argv_printf (&argv, "%s%s interface ipv6 add route %s/%d %s",
 		   get_win_sys_path(),
 		   NETSH_PATH_SUFFIX,
 		   network,

@@ -1969,7 +1969,7 @@ delete_route (struct route_ipv4 *r,
 
 #elif defined (WIN32)
   
-  argv_printf (&argv, "%s%sc DELETE %s MASK %s %s",
+  argv_printf (&argv, "%s%s DELETE %s MASK %s %s",
 	       get_win_sys_path(),
 	       WIN_ROUTE_PATH_SUFFIX,
 	       network,

@@ -2199,7 +2199,7 @@ delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigne
       device = buf_bptr(&out);
 
       /* netsh interface ipv6 delete route 2001:db8::/32 MyTunDevice */
-      argv_printf (&argv, "%s%sc interface ipv6 delete route %s/%d %s",
+      argv_printf (&argv, "%s%s interface ipv6 delete route %s/%d %s",
 		   get_win_sys_path(),
 		   NETSH_PATH_SUFFIX,
 		   network,

index 12c6976..843df16 100644
@@ -1362,7 +1362,7 @@ do_ifconfig (struct tuntap *tt,
 	    char iface[64];
 	    openvpn_snprintf(iface, sizeof(iface), "interface=%lu", tt->adapter_index );
 	    argv_printf (&argv,
-			 "%s%sc interface ipv6 set address %s %s store=active",
+			 "%s%s interface ipv6 set address %s %s store=active",
 			 get_win_sys_path(),
 			 NETSH_PATH_SUFFIX,
 			 iface,

@@ -4490,28 +4490,28 @@ ipconfig_register_dns (const struct env_set *es)
   msg (D_TUNTAP_INFO, "Start net commands...");
   netcmd_semaphore_lock ();
 
-  argv_printf (&argv, "%s%sc stop dnscache",
+  argv_printf (&argv, "%s%s stop dnscache",
 	       get_win_sys_path(),
 	       WIN_NET_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
   argv_reset(&argv);
 
-  argv_printf (&argv, "%s%sc start dnscache",
+  argv_printf (&argv, "%s%s start dnscache",
 	       get_win_sys_path(),
 	       WIN_NET_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
   argv_reset(&argv);
 
-  argv_printf (&argv, "%s%sc /flushdns",
+  argv_printf (&argv, "%s%s /flushdns",
 	       get_win_sys_path(),
 	       WIN_IPCONFIG_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
   argv_reset(&argv);
 
-  argv_printf (&argv, "%s%sc /registerdns",
+  argv_printf (&argv, "%s%s /registerdns",
 	       get_win_sys_path(),
 	       WIN_IPCONFIG_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);

@@ -4620,7 +4620,7 @@ netsh_ifconfig_options (const char *type,
   /* delete existing DNS/WINS settings from TAP interface */
   if (delete_first)
     {
-      argv_printf (&argv, "%s%sc interface ip delete %s %s all",
+      argv_printf (&argv, "%s%s interface ip delete %s %s all",
 		   get_win_sys_path(),
 		   NETSH_PATH_SUFFIX,
 		   type,

@@ -4637,8 +4637,8 @@ netsh_ifconfig_options (const char *type,
 	if (delete_first || !test_first || !ip_addr_member_of (addr_list[i], current))
 	  {
 	    const char *fmt = count ?
-	        "%s%sc interface ip add %s %s %s"
-	      : "%s%sc interface ip set %s %s static %s";
+	        "%s%s interface ip add %s %s %s"
+	      : "%s%s interface ip set %s %s static %s";
 
 	    argv_printf (&argv, fmt,
 			 get_win_sys_path(),

@@ -4714,7 +4714,7 @@ netsh_ifconfig (const struct tuntap_options *to,
       else
 	{
 	  /* example: netsh interface ip set address my-tap static 10.3.0.1 255.255.255.0 */
-	  argv_printf (&argv, "%s%sc interface ip set address %s static %s %s",
+	  argv_printf (&argv, "%s%s interface ip set address %s static %s %s",
 		       get_win_sys_path(),
 		       NETSH_PATH_SUFFIX,
 		       flex_name,

@@ -4761,7 +4761,7 @@ netsh_enable_dhcp (const struct tuntap_options *to,
 
   /* example: netsh interface ip set address my-tap dhcp */
   argv_printf (&argv,
-	      "%s%sc interface ip set address %s dhcp",
+	      "%s%s interface ip set address %s dhcp",
 	       get_win_sys_path(),
 	       NETSH_PATH_SUFFIX,
 	       actual_name);

@@ -5535,7 +5535,7 @@ close_tun (struct tuntap *tt)
               /* netsh interface ipv6 delete address \"%s\" %s */
               ifconfig_ipv6_local = print_in6_addr (tt->local_ipv6, 0,  &gc);
               argv_printf (&argv,
-                           "%s%sc interface ipv6 delete address %s %s store=active",
+                           "%s%s interface ipv6 delete address %s %s store=active",
                            get_win_sys_path(),
                            NETSH_PATH_SUFFIX,
                            tt->actual_name,

index 3945634..0371c78 100644
@@ -9,6 +9,7 @@
 #include <setjmp.h>
 #include <cmocka.h>
 #include <assert.h>
+#include <stdbool.h>
 
 #include "argv.h"
 #include "buffer.h"

@@ -82,17 +83,40 @@ argv_printf_cat__multiple_spaces_in_format__parsed_as_one (void **state)
 }
 
 static void
+argv_printf__embedded_format_directive__replaced_in_output (void **state)
+{
+  struct argv a = argv_new ();
+
+  argv_printf (&a, "<p1:%s>", PATH1);
+  assert_int_equal (a.argc, 1);
+  assert_string_equal (a.argv[0], "<p1:" PATH1 ">");
+
+  argv_reset (&a);
+}
+
+static void
+argv_printf__group_sep_in_arg__fail_no_ouput (void **state)
+{
+  struct argv a = argv_new ();
+
+  assert_false (argv_printf (&a, "tool --do %s", "this\035--harmful"));
+  assert_int_equal (a.argc, 0);
+
+  argv_reset (&a);
+}
+
+static void
 argv_printf__combined_path_with_spaces__argc_correct (void **state)
 {
   struct argv a = argv_new ();
 
-  argv_printf (&a, "%s%sc", PATH1, PATH2);
+  argv_printf (&a, "%s%s", PATH1, PATH2);
   assert_int_equal (a.argc, 1);
 
-  argv_printf (&a, "%s%sc %d", PATH1, PATH2, 42);
+  argv_printf (&a, "%s%s %d", PATH1, PATH2, 42);
   assert_int_equal (a.argc, 2);
 
-  argv_printf (&a, "foo %s%sc %s x y", PATH2, PATH1, "foo");
+  argv_printf (&a, "foo %s%s %s x y", PATH2, PATH1, "foo");
   assert_int_equal (a.argc, 5);
 
   argv_reset (&a);

@@ -141,7 +165,7 @@ argv_str__multiple_argv__correct_output (void **state)
   struct gc_arena gc = gc_new ();
   const char *output;
 
-  argv_printf (&a, "%s%sc", PATH1, PATH2);
+  argv_printf (&a, "%s%s", PATH1, PATH2);
   argv_printf_cat (&a, "%s", PARAM1);
   argv_printf_cat (&a, "%s", PARAM2);
   output = argv_str (&a, &gc, PA_BRACKET);

@@ -192,6 +216,8 @@ main(void)
   const struct CMUnitTest tests[] = {
     cmocka_unit_test (argv_printf__multiple_spaces_in_format__parsed_as_one),
     cmocka_unit_test (argv_printf_cat__multiple_spaces_in_format__parsed_as_one),
+    cmocka_unit_test (argv_printf__embedded_format_directive__replaced_in_output),
+    cmocka_unit_test (argv_printf__group_sep_in_arg__fail_no_ouput),
     cmocka_unit_test (argv_printf__combined_path_with_spaces__argc_correct),
     cmocka_unit_test (argv_parse_cmd__command_string__argc_correct),
     cmocka_unit_test (argv_parse_cmd__command_and_extra_options__argc_correct),

index 95bdfeac..afe8efff 100644
@@ -130,64 +130,6 @@ argv_insert_head(const struct argv *a, const char *head)
     return r;
 }
 
-static char *
-argv_term(const char **f)
-{
-    const char *p = *f;
-    const char *term = NULL;
-    size_t termlen = 0;
-
-    if (*p == '\0')
-    {
-        return NULL;
-    }
-
-    while (true)
-    {
-        const int c = *p;
-        if (c == '\0')
-        {
-            break;
-        }
-        if (term)
-        {
-            if (!isspace(c))
-            {
-                ++termlen;
-            }
-            else
-            {
-                break;
-            }
-        }
-        else
-        {
-            if (!isspace(c))
-            {
-                term = p;
-                termlen = 1;
-            }
-        }
-        ++p;
-    }
-    *f = p;
-
-    if (term)
-    {
-        char *ret;
-        ASSERT(termlen > 0);
-        ret = malloc(termlen + 1);
-        check_malloc_return(ret);
-        memcpy(ret, term, termlen);
-        ret[termlen] = '\0';
-        return ret;
-    }
-    else
-    {
-        return NULL;
-    }
-}
-
 const char *
 argv_str(const struct argv *a, struct gc_arena *gc, const unsigned int flags)
 {

@@ -217,112 +159,141 @@ argv_msg_prefix(const int msglev, const struct argv *a, const char *prefix)
     gc_free(&gc);
 }
 
-static void
-argv_printf_arglist(struct argv *a, const char *format, va_list arglist)
+/*
+ * argv_prep_format - prepare argv format string for further processing
+ *
+ * Individual argument must be separated by space. Ignores leading and trailing spaces.
+ * Consecutive spaces count as one. Returns prepared format string, with space replaced
+ * by delim and adds the number of arguments to the count parameter.
+ */
+static char *
+argv_prep_format(const char *format, const char delim, size_t *count, struct gc_arena *gc)
 {
-    char *term;
-    const char *f = format;
+    int i, j;
+    char *f;
+    bool in_token = false;
 
-    argv_extend(a, 1); /* ensure trailing NULL */
+    if (format == NULL)
+    {
+        return NULL;
+    }
 
-    while ((term = argv_term(&f)) != NULL)
+    f = gc_malloc(strlen(format) + 1, true, gc);
+    for (i = 0, j = 0; i < strlen(format); i++)
     {
-        if (term[0] == '%')
+        if (format[i] == ' ')
         {
-            if (!strcmp(term, "%s"))
-            {
-                char *s = va_arg(arglist, char *);
-                if (!s)
-                {
-                    s = "";
-                }
-                argv_append(a, string_alloc(s, NULL));
-            }
-            else if (!strcmp(term, "%d"))
-            {
-                char numstr[64];
-                openvpn_snprintf(numstr, sizeof(numstr), "%d", va_arg(arglist, int));
-                argv_append(a, string_alloc(numstr, NULL));
-            }
-            else if (!strcmp(term, "%u"))
-            {
-                char numstr[64];
-                openvpn_snprintf(numstr, sizeof(numstr), "%u", va_arg(arglist, unsigned int));
-                argv_append(a, string_alloc(numstr, NULL));
-            }
-            else if (!strcmp(term, "%s/%d"))
-            {
-                char numstr[64];
-                char *s = va_arg(arglist, char *);
-
-                if (!s)
-                {
-                    s = "";
-                }
-
-                openvpn_snprintf(numstr, sizeof(numstr), "%d", va_arg(arglist, int));
-
-                {
-                    const size_t len = strlen(s) + strlen(numstr) + 2;
-                    char *combined = (char *) malloc(len);
-                    check_malloc_return(combined);
-
-                    strcpy(combined, s);
-                    strcat(combined, "/");
-                    strcat(combined, numstr);
-                    argv_append(a, combined);
-                }
-            }
-            else if (!strcmp(term, "%s%sc"))
-            {
-                char *s1 = va_arg(arglist, char *);
-                char *s2 = va_arg(arglist, char *);
-                char *combined;
-
-                if (!s1)
-                {
-                    s1 = "";
-                }
-                if (!s2)
-                {
-                    s2 = "";
-                }
-                combined = (char *) malloc(strlen(s1) + strlen(s2) + 1);
-                check_malloc_return(combined);
-                strcpy(combined, s1);
-                strcat(combined, s2);
-                argv_append(a, combined);
-            }
-            else
-            {
-                ASSERT(0);
-            }
-            free(term);
+            in_token = false;
+            continue;
         }
-        else
+
+        if (!in_token)
         {
-            argv_append(a, term);
+            ++*count;
+            if (f[0]) /* not after leading spaces */
+            {
+                f[j++] = delim;
+            }
         }
+
+        f[j++] = format[i];
+        in_token = true;
     }
+
+    return f;
 }
 
-void
+/*
+ * argv_printf_arglist - create a struct argv from a format string
+ *
+ * Instead of parsing the format string ourselves place delimiters via argv_prep_format()
+ * before we let libc's printf() do the parsing. Then split the resulting string at the
+ * injected delimiters.
+ */
+static bool
+argv_printf_arglist(struct argv *a, const char *format, va_list arglist)
+{
+    struct gc_arena gc = gc_new();
+    const char *delim = 035;
+    char *f, *buf, *end;
+    size_t argc, size;
+    bool res = false;
+    va_list tmplist;
+    int len;
+
+    argv_extend(a, 1); /* ensure trailing NULL */
+
+    argc = a->argc;
+    f = argv_prep_format(format, delim, &argc, &gc);
+    if (f == NULL)
+    {
+        goto out;
+    }
+
+    /* determine minimum buffer size */
+    va_copy(tmplist, arglist);
+    len = vsnprintf(NULL, 0, f, tmplist);
+    va_end(tmplist);
+    if (len < 0)
+    {
+        goto out;
+    }
+
+    size = adjust_power_of_2(len + 1);
+    buf = gc_malloc(size, false, &gc);
+    len = vsnprintf(buf, size, f, arglist);
+    if (len < 0 || len >= size)
+    {
+        goto out;
+    }
+
+    /* split the string at the delimiters */
+    end = strchr(buf, delim);
+    while (end)
+    {
+        *end = '\0';
+        argv_append(a, string_alloc(buf, NULL));
+        buf = end + 1;
+        end = strchr(buf, delim);
+    }
+    argv_append(a, string_alloc(buf, NULL));
+
+    if (a->argc != argc)
+    {
+        /* Someone snuck in a \035, fail gracefully */
+        argv_reset(a);
+        argv_extend(a, 1); /* ensure trailing NULL */
+        goto out;
+    }
+
+    res = true;
+
+out:
+    gc_free(&gc);
+    return res;
+}
+
+bool
 argv_printf(struct argv *a, const char *format, ...)
 {
+    bool res;
     va_list arglist;
-    argv_reset(a);
     va_start(arglist, format);
-    argv_printf_arglist(a, format, arglist);
+    argv_reset(a);
+    res = argv_printf_arglist(a, format, arglist);
     va_end(arglist);
+    return res;
 }
 
-void
+bool
 argv_printf_cat(struct argv *a, const char *format, ...)
 {
+    bool res;
     va_list arglist;
     va_start(arglist, format);
-    argv_printf_arglist(a, format, arglist);
+    res = argv_printf_arglist(a, format, arglist);
     va_end(arglist);
+    return res;
 }
 
 void

index 7d0754c9..a24ba98f 100644
@@ -52,7 +52,7 @@ void argv_msg_prefix(const int msglev, const struct argv *a, const char *prefix)
 
 void argv_parse_cmd(struct argv *a, const char *s);
 
-void argv_printf(struct argv *a, const char *format, ...)
+bool argv_printf(struct argv *a, const char *format, ...)
 #ifdef __GNUC__
 #if __USE_MINGW_ANSI_STDIO
 __attribute__ ((format(gnu_printf, 2, 3)))

@@ -62,7 +62,7 @@ __attribute__ ((format(__printf__, 2, 3)))
 #endif
 ;
 
-void argv_printf_cat(struct argv *a, const char *format, ...)
+bool argv_printf_cat(struct argv *a, const char *format, ...)
 #ifdef __GNUC__
 #if __USE_MINGW_ANSI_STDIO
 __attribute__ ((format(gnu_printf, 2, 3)))

index 8c71e6ec..02f7299f 100644
@@ -1614,7 +1614,7 @@ add_route(struct route_ipv4 *r,
 #elif defined (_WIN32)
     {
         DWORD ai = TUN_ADAPTER_INDEX_INVALID;
-        argv_printf(&argv, "%s%sc ADD %s MASK %s %s",
+        argv_printf(&argv, "%s%s ADD %s MASK %s %s",
                     get_win_sys_path(),
                     WIN_ROUTE_PATH_SUFFIX,
                     network,

@@ -1979,7 +1979,7 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flag
         device = buf_bptr(&out);
 
         /* netsh interface ipv6 add route 2001:db8::/32 MyTunDevice */
-        argv_printf(&argv, "%s%sc interface ipv6 add route %s/%d %s",
+        argv_printf(&argv, "%s%s interface ipv6 add route %s/%d %s",
                     get_win_sys_path(),
                     NETSH_PATH_SUFFIX,
                     network,

@@ -2186,7 +2186,7 @@ delete_route(struct route_ipv4 *r,
 
 #elif defined (_WIN32)
 
-    argv_printf(&argv, "%s%sc DELETE %s MASK %s %s",
+    argv_printf(&argv, "%s%s DELETE %s MASK %s %s",
                 get_win_sys_path(),
                 WIN_ROUTE_PATH_SUFFIX,
                 network,

@@ -2426,7 +2426,7 @@ delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt, unsigned
         device = buf_bptr(&out);
 
         /* netsh interface ipv6 delete route 2001:db8::/32 MyTunDevice */
-        argv_printf(&argv, "%s%sc interface ipv6 delete route %s/%d %s",
+        argv_printf(&argv, "%s%s interface ipv6 delete route %s/%d %s",
                     get_win_sys_path(),
                     NETSH_PATH_SUFFIX,
                     network,

index 25831ce3..61d6b9eb 100644
@@ -1565,7 +1565,7 @@ do_ifconfig(struct tuntap *tt,
                 char iface[64];
                 openvpn_snprintf(iface, sizeof(iface), "interface=%lu", tt->adapter_index );
                 argv_printf(&argv,
-                            "%s%sc interface ipv6 set address %s %s store=active",
+                            "%s%s interface ipv6 set address %s %s store=active",
                             get_win_sys_path(),
                             NETSH_PATH_SUFFIX,
                             iface,

@@ -5023,14 +5023,14 @@ ipconfig_register_dns(const struct env_set *es)
     msg(D_TUNTAP_INFO, "Start ipconfig commands for register-dns...");
     netcmd_semaphore_lock();
 
-    argv_printf(&argv, "%s%sc /flushdns",
+    argv_printf(&argv, "%s%s /flushdns",
                 get_win_sys_path(),
                 WIN_IPCONFIG_PATH_SUFFIX);
     argv_msg(D_TUNTAP_INFO, &argv);
     status = openvpn_execve_check(&argv, es, 0, err);
     argv_reset(&argv);
 
-    argv_printf(&argv, "%s%sc /registerdns",
+    argv_printf(&argv, "%s%s /registerdns",
                 get_win_sys_path(),
                 WIN_IPCONFIG_PATH_SUFFIX);
     argv_msg(D_TUNTAP_INFO, &argv);

@@ -5144,8 +5144,8 @@ netsh_set_dns6_servers(const struct in6_addr *addr_list,
     for (int i = 0; i < addr_len; ++i)
     {
         const char *fmt = (i == 0) ?
-                          "%s%sc interface ipv6 set dns %s static %s"
-                          : "%s%sc interface ipv6 add dns %s %s";
+                          "%s%s interface ipv6 set dns %s static %s"
+                          : "%s%s interface ipv6 add dns %s %s";
         argv_printf(&argv, fmt, get_win_sys_path(),
                     NETSH_PATH_SUFFIX, flex_name,
                     print_in6_addr(addr_list[i], 0, &gc));

@@ -5192,7 +5192,7 @@ netsh_ifconfig_options(const char *type,
     /* delete existing DNS/WINS settings from TAP interface */
     if (delete_first)
     {
-        argv_printf(&argv, "%s%sc interface ip delete %s %s all",
+        argv_printf(&argv, "%s%s interface ip delete %s %s all",
                     get_win_sys_path(),
                     NETSH_PATH_SUFFIX,
                     type,

@@ -5209,8 +5209,8 @@ netsh_ifconfig_options(const char *type,
             if (delete_first || !test_first || !ip_addr_member_of(addr_list[i], current))
             {
                 const char *fmt = count ?
-                                  "%s%sc interface ip add %s %s %s"
-                                  : "%s%sc interface ip set %s %s static %s";
+                                  "%s%s interface ip add %s %s %s"
+                                  : "%s%s interface ip set %s %s static %s";
 
                 argv_printf(&argv, fmt,
                             get_win_sys_path(),

@@ -5286,7 +5286,7 @@ netsh_ifconfig(const struct tuntap_options *to,
         else
         {
             /* example: netsh interface ip set address my-tap static 10.3.0.1 255.255.255.0 */
-            argv_printf(&argv, "%s%sc interface ip set address %s static %s %s",
+            argv_printf(&argv, "%s%s interface ip set address %s static %s %s",
                         get_win_sys_path(),
                         NETSH_PATH_SUFFIX,
                         flex_name,

@@ -5335,7 +5335,7 @@ netsh_enable_dhcp(const struct tuntap_options *to,
 
     /* example: netsh interface ip set address my-tap dhcp */
     argv_printf(&argv,
-                "%s%sc interface ip set address %s dhcp",
+                "%s%s interface ip set address %s dhcp",
                 get_win_sys_path(),
                 NETSH_PATH_SUFFIX,
                 actual_name);

@@ -6197,7 +6197,7 @@ close_tun(struct tuntap *tt)
                 /* netsh interface ipv6 delete address \"%s\" %s */
                 ifconfig_ipv6_local = print_in6_addr(tt->local_ipv6, 0,  &gc);
                 argv_printf(&argv,
-                            "%s%sc interface ipv6 delete address %s %s store=active",
+                            "%s%s interface ipv6 delete address %s %s store=active",
                             get_win_sys_path(),
                             NETSH_PATH_SUFFIX,
                             tt->actual_name,

@@ -6209,7 +6209,7 @@ close_tun(struct tuntap *tt)
                 if (tt->options.dns6_len > 0)
                 {
                     argv_printf(&argv,
-                                "%s%sc interface ipv6 delete dns %s all",
+                                "%s%s interface ipv6 delete dns %s all",
                                 get_win_sys_path(),
                                 NETSH_PATH_SUFFIX,
                                 tt->actual_name);

97 lines not on this page · raw message

index dcfbd76..664785b 100644
@@ -41,11 +41,28 @@
 #include "options.h"
 
 static void
+argv_extend (struct argv *a, const size_t newcap)
+{
+  if (newcap > a->capacity)
+    {
+      char **newargv;
+      size_t i;
+      ALLOC_ARRAY_CLEAR (newargv, char *, newcap);
+      for (i = 0; i < a->argc; ++i)
+        newargv[i] = a->argv[i];
+      free (a->argv);
+      a->argv = newargv;
+      a->capacity = newcap;
+    }
+}
+
+static void
 argv_init (struct argv *a)
 {
   a->capacity = 0;
   a->argc = 0;
   a->argv = NULL;
+  argv_extend (a, 8);
 }
 
 struct argv

@@ -57,29 +74,24 @@ argv_new (void)
 }
 
 void
-argv_reset (struct argv *a)
+argv_free (struct argv *a)
 {
   size_t i;
   for (i = 0; i < a->argc; ++i)
     free (a->argv[i]);
   free (a->argv);
-  argv_init (a);
 }
 
 static void
-argv_extend (struct argv *a, const size_t newcap)
+argv_reset (struct argv *a)
 {
-  if (newcap > a->capacity)
+  size_t i;
+  for (i = 0; i < a->argc; ++i)
     {
-      char **newargv;
-      size_t i;
-      ALLOC_ARRAY_CLEAR (newargv, char *, newcap);
-      for (i = 0; i < a->argc; ++i)
-        newargv[i] = a->argv[i];
-      free (a->argv);
-      a->argv = newargv;
-      a->capacity = newcap;
+      free (a->argv[i]);
+      a->argv[i] = NULL;
     }
+  a->argc = 0;
 }
 
 static void

@@ -126,10 +138,7 @@ argv_insert_head (const struct argv *a, const char *head)
 const char *
 argv_str (const struct argv *a, struct gc_arena *gc, const unsigned int flags)
 {
-  if (a->argv)
-    return print_argv ((const char **)a->argv, gc, flags);
-  else
-    return "";
+  return print_argv ((const char **)a->argv, gc, flags);
 }
 
 void

@@ -191,8 +200,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
   va_list tmplist;
   int len;
 
-  argv_extend (a, 1); /* ensure trailing NULL */
-
   argc = a->argc;
   f = argv_prep_format (format, delim[0], &argc, &gc);
   if (f == NULL)

@@ -221,7 +228,6 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
     {
       /* Someone snuck in a \035, fail gracefully */
       argv_reset (a);
-      argv_extend (a, 1); /* ensure trailing NULL */
       goto out;
     }
 

@@ -263,7 +269,6 @@ argv_parse_cmd (struct argv *a, const char *s)
   struct gc_arena gc = gc_new ();
 
   argv_reset (a);
-  argv_extend (a, 1); /* ensure trailing NULL */
 
   nparms = parse_line (s, parms, MAX_PARMS, "SCRIPT-ARGV", 0, D_ARGV_PARSE_CMD, &gc);
   if (nparms)

index ff3933e..99fd7ad 100644
@@ -40,7 +40,7 @@ struct argv {
 };
 
 struct argv argv_new (void);
-void argv_reset (struct argv *a);
+void argv_free (struct argv *a);
 const char *argv_str (const struct argv *a, struct gc_arena *gc, const unsigned int flags);
 struct argv argv_insert_head (const struct argv *a, const char *head);
 void argv_msg (const int msglev, const struct argv *a);

index 8a953c9..c8edf67 100644
@@ -84,7 +84,7 @@ get_console_input_systemd (const char *prompt, const bool echo, char *input, con
     }
     close (std_out);
 
-    argv_reset (&argv);
+    argv_free (&argv);
 
     return ret;
 }

index 56140b3..ab49262 100644
@@ -1364,7 +1364,7 @@ do_route (const struct options *options,
       setenv_str (es, "script_type", "route-up");
       argv_parse_cmd (&argv, options->route_script);
       openvpn_run_script (&argv, es, 0, "--route-up");
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
 #ifdef WIN32

index 57f447b..94d9f08 100644
@@ -62,6 +62,6 @@ int set_lladdr(const char *ifname, const char *lladdr,
   if (r)
     msg (M_INFO, "TUN/TAP link layer address set to %s", lladdr);
 
-  argv_reset (&argv);
+  argv_free (&argv);
   return r;
 }

index b433df6..309cc5f 100644
@@ -112,7 +112,7 @@ run_up_down (const char *command,
       if (plugin_call (plugins, plugin_type, &argv, NULL, es) != OPENVPN_PLUGIN_FUNC_SUCCESS)
 	msg (M_FATAL, "ERROR: up/down plugin call failed");
 
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
   if (command)

@@ -125,7 +125,7 @@ run_up_down (const char *command,
                        ifconfig_local, ifconfig_remote, context);
       argv_msg (M_INFO, &argv);
       openvpn_run_script (&argv, es, S_FATAL, "--up/--down");
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
   gc_free (&gc);

index 9c75f7b..deb80f7 100644
@@ -119,7 +119,7 @@ learn_address_script (const struct multi_context *m,
 	  msg (M_WARN, "WARNING: learn-address plugin call failed");
 	  ret = false;
 	}
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
   if (m->top.options.learn_address_script)

@@ -132,7 +132,7 @@ learn_address_script (const struct multi_context *m,
 	argv_printf_cat (&argv, "%s", tls_common_name (mi->context.c2.tls_multi, false));
       if (!openvpn_run_script (&argv, es, 0, "--learn-address"))
 	ret = false;
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
   gc_free (&gc);

@@ -545,7 +545,7 @@ multi_client_disconnect_script (struct multi_context *m,
 	  setenv_str (mi->context.c2.es, "script_type", "client-disconnect");
 	  argv_parse_cmd (&argv, mi->context.options.client_disconnect_script);
 	  openvpn_run_script (&argv, mi->context.c2.es, 0, "--client-disconnect");
-	  argv_reset (&argv);
+	  argv_free (&argv);
 	}
 #ifdef MANAGEMENT_DEF_AUTH
       if (management)

@@ -1791,7 +1791,7 @@ multi_connection_established (struct multi_context *m, struct multi_instance *mi
 		 dc_file);
 
         script_depr_failed:
-	  argv_reset (&argv);
+	  argv_free (&argv);
 	}
 
       /* V2 callback, use a plugin_return struct for passing back return info */

@@ -1848,7 +1848,7 @@ multi_connection_established (struct multi_context *m, struct multi_instance *mi
 		 dc_file);
 
         script_failed:
-	  argv_reset (&argv);
+	  argv_free (&argv);
 	}
 
       /*

index 557299a..fda51ac 100644
@@ -2794,7 +2794,7 @@ check_cmd_access(const char *command, const char *opt, const char *chroot)
       return_code = true;
     }
 
-  argv_reset (&argv);
+  argv_free (&argv);
 
   return return_code;
 }

index 542e5b1..439ec00 100644
@@ -500,7 +500,7 @@ plugin_call_item (const struct plugin *p,
 	     status,
 	     p->so_pathname);
 
-      argv_reset (&a);
+      argv_free (&a);
       gc_free (&gc);
     }
   return status;

index ca1e0a7..07ab2b2 100644
@@ -1642,7 +1642,7 @@ add_route (struct route_ipv4 *r,
     r->flags |= RT_ADDED;
   else
     r->flags &= ~RT_ADDED;
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
 }
 

@@ -1919,7 +1919,7 @@ add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int fla
     r6->flags |= RT_ADDED;
   else
     r6->flags &= ~RT_ADDED;
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
 }
 

@@ -2097,7 +2097,7 @@ delete_route (struct route_ipv4 *r,
 
  done:
   r->flags &= ~RT_ADDED;
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
 }
 

@@ -2307,7 +2307,7 @@ delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigne
   msg (M_FATAL, "Sorry, but I don't know how to do 'route ipv6' commands on this operating system.  Try putting your routes in a --route-down script");
 #endif
 
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
 }
 

index bb7cba1..c9067a5 100644
@@ -2063,7 +2063,7 @@ link_socket_connection_initiated (const struct buffer *buf,
       ipchange_fmt (false, &argv, info, &gc);
       if (plugin_call (info->plugins, OPENVPN_PLUGIN_IPCHANGE, &argv, NULL, es) != OPENVPN_PLUGIN_FUNC_SUCCESS)
 	msg (M_WARN, "WARNING: ipchange plugin call failed");
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
   /* Process --ipchange option */

@@ -2073,7 +2073,7 @@ link_socket_connection_initiated (const struct buffer *buf,
       setenv_str (es, "script_type", "ipchange");
       ipchange_fmt (true, &argv, info, &gc);
       openvpn_run_script (&argv, es, 0, "--ipchange");
-      argv_reset (&argv);
+      argv_free (&argv);
     }
 
   gc_free (&gc);

index be9f224..7dbf2e6 100644
@@ -447,7 +447,7 @@ verify_cert_call_plugin(const struct plugin_list *plugins, struct env_set *es,
 
       ret = plugin_call_ssl (plugins, OPENVPN_PLUGIN_TLS_VERIFY, &argv, NULL, es, cert_depth, cert);
 
-      argv_reset (&argv);
+      argv_free (&argv);
 
       if (ret == OPENVPN_PLUGIN_FUNC_SUCCESS)
 	{

@@ -527,7 +527,7 @@ verify_cert_call_command(const char *verify_command, struct env_set *es,
     }
 
   gc_free(&gc);
-  argv_reset (&argv);
+  argv_free (&argv);
 
   if (ret)
     {

@@ -1001,7 +1001,7 @@ verify_user_pass_script (struct tls_session *session, const struct user_pass *up
   if (tmp_file && strlen (tmp_file) > 0)
     platform_unlink (tmp_file);
 
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
   return ret;
 }

index 843df16..ab0c168 100644
@@ -1376,7 +1376,7 @@ do_ifconfig (struct tuntap *tt,
 #else
       msg (M_FATAL, "Sorry, but I don't know how to do 'ifconfig' commands on this operating system.  You should ifconfig your TUN/TAP device manually or use an --up script.");
 #endif
-      argv_reset (&argv);
+      argv_free (&argv);
     }
   gc_free (&gc);
 }

@@ -1903,7 +1903,7 @@ close_tun (struct tuntap *tt)
 #endif
               }
 
-	    argv_reset (&argv);
+	    argv_free (&argv);
 	    gc_free (&gc);
 	  }
       close_tun_generic (tt);

@@ -2131,7 +2131,7 @@ solaris_close_tun (struct tuntap *tt)
 		       IFCONFIG_PATH, tt->actual_name );
 	  argv_msg (M_INFO, &argv);
 	  openvpn_execve_check (&argv, NULL, 0, "Solaris ifconfig inet6 unplumb failed");
-	  argv_reset (&argv);
+	  argv_free (&argv);
 	}
 
       if (tt->ip_fd >= 0)

@@ -2208,7 +2208,7 @@ solaris_error_close (struct tuntap *tt, const struct env_set *es,
   openvpn_execve_check (&argv, es, 0, "Solaris ifconfig unplumb failed");
   close_tun (tt);
   msg (M_FATAL, "Solaris ifconfig failed");
-  argv_reset (&argv);
+  argv_free (&argv);
 }
 
 int

@@ -2835,7 +2835,7 @@ close_tun (struct tuntap* tt)
 
       close_tun_generic (tt);
       free (tt);
-      argv_reset (&argv);
+      argv_free (&argv);
       gc_free (&gc);
     }
 }

@@ -4495,31 +4495,28 @@ ipconfig_register_dns (const struct env_set *es)
 	       WIN_NET_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
-  argv_reset(&argv);
 
   argv_printf (&argv, "%s%s start dnscache",
 	       get_win_sys_path(),
 	       WIN_NET_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
-  argv_reset(&argv);
 
   argv_printf (&argv, "%s%s /flushdns",
 	       get_win_sys_path(),
 	       WIN_IPCONFIG_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
-  argv_reset(&argv);
 
   argv_printf (&argv, "%s%s /registerdns",
 	       get_win_sys_path(),
 	       WIN_IPCONFIG_PATH_SUFFIX);
   argv_msg (D_TUNTAP_INFO, &argv);
   status = openvpn_execve_check (&argv, es, 0, err);
-  argv_reset(&argv);
 
   netcmd_semaphore_release ();
   msg (D_TUNTAP_INFO, "End net commands...");
+  argv_free (&argv);
 }
 
 void

@@ -4660,7 +4657,7 @@ netsh_ifconfig_options (const char *type,
       }
   }
 
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
 }
 

@@ -4749,7 +4746,7 @@ netsh_ifconfig (const struct tuntap_options *to,
 			      BOOL_CAST (flags & NI_TEST_FIRST));
     }
   
-  argv_reset (&argv);
+  argv_free (&argv);
   gc_free (&gc);
 }
 

@@ -4768,7 +4765,7 @@ netsh_enable_dhcp (const struct tuntap_options *to,
 
   netsh_command (&argv, 4, M_FATAL);
 
-  argv_reset (&argv);
+  argv_free (&argv);
 }
 
 /*

@@ -5542,7 +5539,7 @@ close_tun (struct tuntap *tt)
                            ifconfig_ipv6_local);
 
               netsh_command (&argv, 1, M_WARN);
-              argv_reset (&argv);
+              argv_free (&argv);
             }
 	}
 #if 1

115 lines not on this page · raw message

index afe8efff..419b1dc6 100644
@@ -40,11 +40,30 @@
 #include "options.h"
 
 static void
+argv_extend(struct argv *a, const size_t newcap)
+{
+    if (newcap > a->capacity)
+    {
+        char **newargv;
+        size_t i;
+        ALLOC_ARRAY_CLEAR(newargv, char *, newcap);
+        for (i = 0; i < a->argc; ++i)
+        {
+            newargv[i] = a->argv[i];
+        }
+        free(a->argv);
+        a->argv = newargv;
+        a->capacity = newcap;
+    }
+}
+
+static void
 argv_init(struct argv *a)
 {
     a->capacity = 0;
     a->argc = 0;
     a->argv = NULL;
+    argv_extend(a, 8);
 }
 
 struct argv

@@ -56,7 +75,7 @@ argv_new(void)
 }
 
 void
-argv_reset(struct argv *a)
+argv_free(struct argv *a)
 {
     size_t i;
     for (i = 0; i < a->argc; ++i)

@@ -64,25 +83,18 @@ argv_reset(struct argv *a)
         free(a->argv[i]);
     }
     free(a->argv);
-    argv_init(a);
 }
 
 static void
-argv_extend(struct argv *a, const size_t newcap)
+argv_reset(struct argv *a)
 {
-    if (newcap > a->capacity)
+    size_t i;
+    for (i = 0; i < a->argc; ++i)
     {
-        char **newargv;
-        size_t i;
-        ALLOC_ARRAY_CLEAR(newargv, char *, newcap);
-        for (i = 0; i < a->argc; ++i)
-        {
-            newargv[i] = a->argv[i];
-        }
-        free(a->argv);
-        a->argv = newargv;
-        a->capacity = newcap;
+        free(a->argv[i]);
+        a->argv[i] = NULL;
     }
+    a->argc = 0;
 }
 
 static void

@@ -133,14 +145,7 @@ argv_insert_head(const struct argv *a, const char *head)
 const char *
 argv_str(const struct argv *a, struct gc_arena *gc, const unsigned int flags)
 {
-    if (a->argv)
-    {
-        return print_argv((const char **)a->argv, gc, flags);
-    }
-    else
-    {
-        return "";
-    }
+    return print_argv((const char **)a->argv, gc, flags);
 }
 
 void

@@ -221,8 +226,6 @@ argv_printf_arglist(struct argv *a, const char *format, va_list arglist)
     va_list tmplist;
     int len;
 
-    argv_extend(a, 1); /* ensure trailing NULL */
-
     argc = a->argc;
     f = argv_prep_format(format, delim, &argc, &gc);
     if (f == NULL)

@@ -262,7 +265,6 @@ argv_printf_arglist(struct argv *a, const char *format, va_list arglist)
     {
         /* Someone snuck in a \035, fail gracefully */
         argv_reset(a);
-        argv_extend(a, 1); /* ensure trailing NULL */
         goto out;
     }
 

@@ -304,7 +306,6 @@ argv_parse_cmd(struct argv *a, const char *s)
     struct gc_arena gc = gc_new();
 
     argv_reset(a);
-    argv_extend(a, 1); /* ensure trailing NULL */
 
     nparms = parse_line(s, parms, MAX_PARMS, "SCRIPT-ARGV", 0, D_ARGV_PARSE_CMD, &gc);
     if (nparms)

index a24ba98f..2a1945e3 100644
@@ -40,7 +40,7 @@ struct argv {
 
 struct argv argv_new(void);
 
-void argv_reset(struct argv *a);
+void argv_free(struct argv *a);
 
 const char *argv_str(const struct argv *a, struct gc_arena *gc, const unsigned int flags);
 

index e7a72ae3..5b09dee4 100644
@@ -84,7 +84,7 @@ get_console_input_systemd(const char *prompt, const bool echo, char *input, cons
     }
     close(std_out);
 
-    argv_reset(&argv);
+    argv_free(&argv);
 
     return ret;
 }

index 1ed2c55e..25962958 100644
@@ -162,7 +162,7 @@ run_up_down(const char *command,
             msg(M_FATAL, "ERROR: up/down plugin call failed");
         }
 
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
     if (command)

@@ -175,7 +175,7 @@ run_up_down(const char *command,
                         ifconfig_local, ifconfig_remote, context);
         argv_msg(M_INFO, &argv);
         openvpn_run_script(&argv, es, S_FATAL, "--up/--down");
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
     gc_free(&gc);

@@ -824,15 +824,6 @@ init_static(void)
     return false;
 #endif
 
-#ifdef ARGV_TEST
-    {
-        void argv_test(void);
-
-        argv_test();
-        return false;
-    }
-#endif
-
 #ifdef PRNG_TEST
     {
         struct gc_arena gc = gc_new();

@@ -1627,7 +1618,7 @@ do_route(const struct options *options,
         setenv_str(es, "script_type", "route-up");
         argv_parse_cmd(&argv, options->route_script);
         openvpn_run_script(&argv, es, 0, "--route-up");
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
 #ifdef _WIN32

index ff71e48c..4df4151a 100644
@@ -67,6 +67,6 @@ set_lladdr(const char *ifname, const char *lladdr,
         msg(M_INFO, "TUN/TAP link layer address set to %s", lladdr);
     }
 
-    argv_reset(&argv);
+    argv_free(&argv);
     return r;
 }

index 4545bce1..df0531e0 100644
@@ -136,7 +136,7 @@ learn_address_script(const struct multi_context *m,
             msg(M_WARN, "WARNING: learn-address plugin call failed");
             ret = false;
         }
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
     if (m->top.options.learn_address_script)

@@ -153,7 +153,7 @@ learn_address_script(const struct multi_context *m,
         {
             ret = false;
         }
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
     gc_free(&gc);

@@ -594,7 +594,7 @@ multi_client_disconnect_script(struct multi_context *m,
             setenv_str(mi->context.c2.es, "script_type", "client-disconnect");
             argv_parse_cmd(&argv, mi->context.options.client_disconnect_script);
             openvpn_run_script(&argv, mi->context.c2.es, 0, "--client-disconnect");
-            argv_reset(&argv);
+            argv_free(&argv);
         }
 #ifdef MANAGEMENT_DEF_AUTH
         if (management)

@@ -1908,7 +1908,7 @@ multi_connection_established(struct multi_context *m, struct multi_instance *mi)
             }
 
 script_depr_failed:
-            argv_reset(&argv);
+            argv_free(&argv);
         }
 
         /* V2 callback, use a plugin_return struct for passing back return info */

@@ -1970,7 +1970,7 @@ script_depr_failed:
             }
 
 script_failed:
-            argv_reset(&argv);
+            argv_free(&argv);
         }
 
         /*

index 7aa311aa..edab9066 100644
@@ -3245,7 +3245,7 @@ check_cmd_access(const char *command, const char *opt, const char *chroot)
         return_code = true;
     }
 
-    argv_reset(&argv);
+    argv_free(&argv);
 
     return return_code;
 }

index 557b6bc7..65b113af 100644
@@ -591,7 +591,7 @@ plugin_call_item(const struct plugin *p,
                 p->so_pathname);
         }
 
-        argv_reset(&a);
+        argv_free(&a);
         gc_free(&gc);
     }
     return status;

index 02f7299f..0e4237d6 100644
@@ -1815,7 +1815,7 @@ done:
     {
         r->flags &= ~RT_ADDED;
     }
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

@@ -2122,7 +2122,7 @@ add_route_ipv6(struct route_ipv6 *r6, const struct tuntap *tt, unsigned int flag
     {
         r6->flags &= ~RT_ADDED;
     }
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

@@ -2314,7 +2314,7 @@ delete_route(struct route_ipv4 *r,
 
 done:
     r->flags &= ~RT_ADDED;
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

@@ -2548,7 +2548,7 @@ delete_route_ipv6(const struct route_ipv6 *r6, const struct tuntap *tt, unsigned
     msg(M_FATAL, "Sorry, but I don't know how to do 'route ipv6' commands on this operating system.  Try putting your routes in a --route-down script");
 #endif /* if defined(TARGET_LINUX) */
 
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

index 0fc91f21..2f373116 100644
@@ -2334,7 +2334,7 @@ link_socket_connection_initiated(const struct buffer *buf,
         {
             msg(M_WARN, "WARNING: ipchange plugin call failed");
         }
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
     /* Process --ipchange option */

@@ -2344,7 +2344,7 @@ link_socket_connection_initiated(const struct buffer *buf,
         setenv_str(es, "script_type", "ipchange");
         ipchange_fmt(true, &argv, info, &gc);
         openvpn_run_script(&argv, es, 0, "--ipchange");
-        argv_reset(&argv);
+        argv_free(&argv);
     }
 
     gc_free(&gc);

index 9cd36d7a..65342860 100644
@@ -524,7 +524,7 @@ verify_cert_call_plugin(const struct plugin_list *plugins, struct env_set *es,
 
         ret = plugin_call_ssl(plugins, OPENVPN_PLUGIN_TLS_VERIFY, &argv, NULL, es, cert_depth, cert);
 
-        argv_reset(&argv);
+        argv_free(&argv);
 
         if (ret == OPENVPN_PLUGIN_FUNC_SUCCESS)
         {

@@ -610,7 +610,7 @@ verify_cert_call_command(const char *verify_command, struct env_set *es,
     }
 
     gc_free(&gc);
-    argv_reset(&argv);
+    argv_free(&argv);
 
     if (ret)
     {

@@ -1153,7 +1153,7 @@ done:
         platform_unlink(tmp_file);
     }
 
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
     return ret;
 }

index 61d6b9eb..d0e56bf1 100644
@@ -1584,7 +1584,7 @@ do_ifconfig(struct tuntap *tt,
 #else  /* if defined(TARGET_LINUX) */
         msg(M_FATAL, "Sorry, but I don't know how to do 'ifconfig' commands on this operating system.  You should ifconfig your TUN/TAP device manually or use an --up script.");
 #endif /* if defined(TARGET_LINUX) */
-        argv_reset(&argv);
+        argv_free(&argv);
     }
     gc_free(&gc);
 }

@@ -2166,7 +2166,7 @@ close_tun(struct tuntap *tt)
 #endif
             }
 
-            argv_reset(&argv);
+            argv_free(&argv);
             gc_free(&gc);
         }
         close_tun_generic(tt);

@@ -2439,7 +2439,7 @@ solaris_close_tun(struct tuntap *tt)
                          IFCONFIG_PATH, tt->actual_name );
             argv_msg(M_INFO, &argv);
             openvpn_execve_check(&argv, NULL, 0, "Solaris ifconfig inet6 unplumb failed");
-            argv_reset(&argv);
+            argv_free(&argv);
         }
 
         if (tt->ip_fd >= 0)

@@ -2526,7 +2526,7 @@ solaris_error_close(struct tuntap *tt, const struct env_set *es,
     openvpn_execve_check(&argv, es, 0, "Solaris ifconfig unplumb failed");
     close_tun(tt);
     msg(M_FATAL, "Solaris ifconfig failed");
-    argv_reset(&argv);
+    argv_free(&argv);
 }
 
 int

@@ -2598,7 +2598,6 @@ close_tun(struct tuntap *tt)
     }
     else if (tt)
     {
-        struct gc_arena gc = gc_new();
         struct argv argv = argv_new();
 
         /* setup command, close tun dev (clears tt->actual_name!), run command

@@ -2612,6 +2611,7 @@ close_tun(struct tuntap *tt)
         argv_msg(M_INFO, &argv);
         openvpn_execve_check(&argv, NULL, 0, "OpenBSD 'destroy tun interface' failed (non-critical)");
 
+        argv_free(&argv);
         free(tt);
     }
 }

@@ -2683,7 +2683,6 @@ close_tun(struct tuntap *tt)
     }
     else if (tt)
     {
-        struct gc_arena gc = gc_new();
         struct argv argv = argv_new();
 
         /* setup command, close tun dev (clears tt->actual_name!), run command

@@ -2697,6 +2696,7 @@ close_tun(struct tuntap *tt)
         argv_msg(M_INFO, &argv);
         openvpn_execve_check(&argv, NULL, 0, "NetBSD 'destroy tun interface' failed (non-critical)");
 
+        argv_free(&argv);
         free(tt);
     }
 }

@@ -2834,6 +2834,7 @@ close_tun(struct tuntap *tt)
         argv_msg(M_INFO, &argv);
         openvpn_execve_check(&argv, NULL, 0, "FreeBSD 'destroy tun interface' failed (non-critical)");
 
+        argv_free(&argv);
         free(tt);
     }
 }

@@ -3201,7 +3202,7 @@ close_tun(struct tuntap *tt)
 
         close_tun_generic(tt);
         free(tt);
-        argv_reset(&argv);
+        argv_free(&argv);
         gc_free(&gc);
     }
 }

@@ -3306,6 +3307,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
         env_set_add( es, "ODMDIR=/etc/objrepos" );
         openvpn_execve_check(&argv, es, S_FATAL, "AIX 'create tun interface' failed");
         env_set_destroy(es);
+        argv_free(&argv);
     }
     else
     {

@@ -3331,7 +3333,6 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
 void
 close_tun(struct tuntap *tt)
 {
-    struct gc_arena gc = gc_new();
     struct argv argv = argv_new();
     struct env_set *es = env_set_create(NULL);
 

@@ -3360,6 +3361,7 @@ close_tun(struct tuntap *tt)
 
     free(tt);
     env_set_destroy(es);
+    argv_free(&argv);
 }
 
 int

@@ -5028,14 +5030,14 @@ ipconfig_register_dns(const struct env_set *es)
                 WIN_IPCONFIG_PATH_SUFFIX);
     argv_msg(D_TUNTAP_INFO, &argv);
     status = openvpn_execve_check(&argv, es, 0, err);
-    argv_reset(&argv);
+    argv_free(&argv);
 
     argv_printf(&argv, "%s%s /registerdns",
                 get_win_sys_path(),
                 WIN_IPCONFIG_PATH_SUFFIX);
     argv_msg(D_TUNTAP_INFO, &argv);
     status = openvpn_execve_check(&argv, es, 0, err);
-    argv_reset(&argv);
+    argv_free(&argv);
 
     netcmd_semaphore_release();
     msg(D_TUNTAP_INFO, "End ipconfig commands for register-dns...");

@@ -5160,7 +5162,7 @@ netsh_set_dns6_servers(const struct in6_addr *addr_list,
         netsh_command(&argv, 1, (i==0) ? M_FATAL : M_NONFATAL);
     }
 
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

@@ -5232,7 +5234,7 @@ netsh_ifconfig_options(const char *type,
         }
     }
 
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

@@ -5323,7 +5325,7 @@ netsh_ifconfig(const struct tuntap_options *to,
                                BOOL_CAST(flags & NI_TEST_FIRST));
     }
 
-    argv_reset(&argv);
+    argv_free(&argv);
     gc_free(&gc);
 }
 

@@ -5342,7 +5344,7 @@ netsh_enable_dhcp(const struct tuntap_options *to,
 
     netsh_command(&argv, 4, M_FATAL);
 
-    argv_reset(&argv);
+    argv_free(&argv);
 }
 
 /*

@@ -6215,7 +6217,7 @@ close_tun(struct tuntap *tt)
                                 tt->actual_name);
                     netsh_command(&argv, 1, M_WARN);
                 }
-                argv_reset(&argv);
+                argv_free(&argv);
             }
         }
 #if 1

115 lines not on this page · raw message

index 664785b..9f139bb 100644
@@ -62,6 +62,7 @@ argv_init (struct argv *a)
   a->capacity = 0;
   a->argc = 0;
   a->argv = NULL;
+  a->gc = gc_new ();
   argv_extend (a, 8);
 }
 

@@ -76,22 +77,23 @@ argv_new (void)
 void
 argv_free (struct argv *a)
 {
-  size_t i;
-  for (i = 0; i < a->argc; ++i)
-    free (a->argv[i]);
+  gc_free (&a->gc);
   free (a->argv);
 }
 
 static void
 argv_reset (struct argv *a)
 {
-  size_t i;
-  for (i = 0; i < a->argc; ++i)
+  if (a->argc)
     {
-      free (a->argv[i]);
-      a->argv[i] = NULL;
+      size_t i;
+      for (i = 0; i < a->argc; ++i)
+        a->argv[i] = NULL;
+      a->argc = 0;
+
+      gc_free (&a->gc);
+      a->gc = gc_new ();
     }
-  a->argc = 0;
 }
 
 static void

@@ -103,7 +105,7 @@ argv_grow (struct argv *a, const size_t add)
 }
 
 static void
-argv_append (struct argv *a, char *str) /* str must have been malloced or be NULL */
+argv_append (struct argv *a, char *str) /* str must have been gc_malloced or be NULL */
 {
   argv_grow (a, 1);
   a->argv[a->argc++] = str;

@@ -121,7 +123,7 @@ argv_clone (const struct argv *a, const size_t headroom)
   if (a)
     {
       for (i = 0; i < a->argc; ++i)
-        argv_append (&r, string_alloc (a->argv[i], NULL));
+        argv_append (&r, string_alloc (a->argv[i], &r.gc));
     }
   return r;
 }

@@ -131,7 +133,7 @@ argv_insert_head (const struct argv *a, const char *head)
 {
   struct argv r;
   r = argv_clone (a, 1);
-  r.argv[0] = string_alloc (head, NULL);
+  r.argv[0] = string_alloc (head, &r.gc);
   return r;
 }
 

@@ -212,7 +214,7 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
     goto out;
 
   size = adjust_power_of_2 (len + 1);
-  buf = gc_malloc (size, false, &gc);
+  buf = gc_malloc (size, false, &a->gc);
   len = vsnprintf (buf, size, f, arglist);
   if (len < 0 || len >= size)
     goto out;

@@ -220,7 +222,7 @@ argv_printf_arglist (struct argv *a, const char *format, va_list arglist)
   token = strtok (buf, delim);
   while (token)
     {
-      argv_append (a, string_alloc (token, NULL));
+      argv_append (a, token);
       token = strtok (NULL, delim);
     }
 

@@ -266,19 +268,16 @@ argv_parse_cmd (struct argv *a, const char *s)
 {
   int nparms;
   char *parms[MAX_PARMS + 1];
-  struct gc_arena gc = gc_new ();
 
   argv_reset (a);
 
-  nparms = parse_line (s, parms, MAX_PARMS, "SCRIPT-ARGV", 0, D_ARGV_PARSE_CMD, &gc);
+  nparms = parse_line (s, parms, MAX_PARMS, "SCRIPT-ARGV", 0, D_ARGV_PARSE_CMD, &a->gc);
   if (nparms)
     {
       int i;
       for (i = 0; i < nparms; ++i)
-        argv_append (a, string_alloc (parms[i], NULL));
+        argv_append (a, parms[i]);
     }
   else
-    argv_append (a, string_alloc (s, NULL));
-
-  gc_free (&gc);
+    argv_append (a, string_alloc (s, &a->gc));
 }

index 99fd7ad..7169f1d 100644
@@ -34,6 +34,7 @@
 #include "buffer.h"
 
 struct argv {
+  struct gc_arena gc;
   size_t capacity;
   size_t argc;
   char **argv;

index d2cd96d..3de1897 100644
@@ -123,6 +123,27 @@ argv_printf__combined_path_with_spaces__argc_correct (void **state)
 }
 
 static void
+argv_printf__long_args__data_correct (void **state)
+{
+  int i;
+  struct argv a = argv_new ();
+  const char *args[] = {
+    "good_tools_have_good_names_even_though_it_might_impair_typing",
+    "--long-opt=looooooooooooooooooooooooooooooooooooooooooooooooong",
+    "--long-cat=loooooooooooooooooooooooooooooooooooooooooooooooooooonger",
+    "file_with_very_descriptive_filename_that_leaves_no_questions_open.jpg.exe"
+  };
+
+  argv_printf (&a, "%s %s %s %s", args[0], args[1], args[2], args[3]);
+  assert_int_equal (a.argc, 4);
+  for (i = 0; i < a.argc; i++) {
+    assert_string_equal (a.argv[i], args[i]);
+  }
+
+  argv_free (&a);
+}
+
+static void
 argv_parse_cmd__command_string__argc_correct (void **state)
 {
   struct argv a = argv_new ();