Changes in / [923c3f6:ba4d1ad]

Files:

• commands.c (modified) (1 diff)
• util.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)
• zwrite.c (modified) (4 diffs)

commands.c

@@ -1985 +1985 @@
   }
   /* check for a zwrite -m */
-  z = owl_zwrite_new(buff);
+  z = owl_zwrite_new(argc, argv);
   if (!z) {
     owl_function_error("Error in zwrite arguments");

util.c

@@ -262 +262 @@
 CALLER_OWN char *owl_arg_quote(const char *arg)
 {
-  GString *buf = g_string_new("");;
+  GString *buf = g_string_new("");
   owl_string_append_quoted_arg(buf, arg);
+  return g_string_free(buf, false);
+}
+
+/* Returns a quoted version of argv. owl_parseline on the result should give
+ * back the input. */
+CALLER_OWN char *owl_argv_quote(int argc, const char *const *argv)
+{
+  int i;
+  GString *buf = g_string_new("");
+  for (i = 0; i < argc; i++) {
+    if (i > 0)
+      g_string_append_c(buf, ' ');
+    owl_string_append_quoted_arg(buf, argv[i]);
+  }
   return g_string_free(buf, false);
 }

zephyr.c

@@ -909 +909 @@
   g_free(to);
 
-  z = owl_zwrite_new(tmpbuff);
+  z = owl_zwrite_new_from_line(tmpbuff);
   g_free(tmpbuff);
   if (z == NULL) {

zwrite.c

@@ -1 +1 @@
 #include "owl.h"
 
-CALLER_OWN owl_zwrite *owl_zwrite_new(const char *line)
+CALLER_OWN owl_zwrite *owl_zwrite_new_from_line(const char *line)
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
@@ -11 +11 @@
 }
 
+CALLER_OWN owl_zwrite *owl_zwrite_new(int argc, const char *const *argv)
+{
+  owl_zwrite *z = g_new(owl_zwrite, 1);
+  if (owl_zwrite_create(z, argc, argv) < 0) {
+    owl_zwrite_delete(z);
+    return NULL;
+  }
+  return z;
+}
+
 G_GNUC_WARN_UNUSED_RESULT int owl_zwrite_create_from_line(owl_zwrite *z, const char *line)
 {
-  int argc, badargs, myargc;
+  int argc;
   char **argv;
-  const char *const *myargv;
+  int ret;
+
+  /* parse the command line for options */
+  argv = owl_parseline(line, &argc);
+  if (argc < 0) {
+    owl_function_error("Unbalanced quotes in zwrite");
+    return -1;
+  }
+  ret = owl_zwrite_create(z, argc, strs(argv));
+  g_strfreev(argv);
+  return ret;
+}
+
+G_GNUC_WARN_UNUSED_RESULT int owl_zwrite_create(owl_zwrite *z, int argc, const char *const *argv)
+{
+  int badargs = 0;
   char *msg = NULL;
-
-  badargs=0;
   
   /* start with null entries */
@@ -31 +54 @@
   z->noping=0;
   z->recips = g_ptr_array_new();
-  z->zwriteline = g_strdup(line);
-
-  /* parse the command line for options */
-  argv=owl_parseline(line, &argc);
-  myargv=strs(argv);
-  if (argc<0) {
-    owl_function_error("Unbalanced quotes in zwrite");
-    return(-1);
-  }
-  myargc=argc;
-  if (myargc && *(myargv[0])!='-') {
-    z->cmd=g_strdup(myargv[0]);
-    myargc--;
-    myargv++;
-  }
-  while (myargc) {
-    if (!strcmp(myargv[0], "-c")) {
-      if (myargc<2) {
-        badargs=1;
-        break;
-      }
-      z->class=owl_validate_utf8(myargv[1]);
-      myargv+=2;
-      myargc-=2;
-    } else if (!strcmp(myargv[0], "-i")) {
-      if (myargc<2) {
-        badargs=1;
-        break;
-      }
-      z->inst=owl_validate_utf8(myargv[1]);
-      myargv+=2;
-      myargc-=2;
-    } else if (!strcmp(myargv[0], "-r")) {
-      if (myargc<2) {
-        badargs=1;
-        break;
-      }
-      z->realm=owl_validate_utf8(myargv[1]);
-      myargv+=2;
-      myargc-=2;
-    } else if (!strcmp(myargv[0], "-s")) {
-      if (myargc<2) {
-        badargs=1;
-        break;
-      }
-      z->zsig=owl_validate_utf8(myargv[1]);
-      myargv+=2;
-      myargc-=2;
-    } else if (!strcmp(myargv[0], "-O")) {
-      if (myargc<2) {
-        badargs=1;
-        break;
-      }
-      z->opcode=owl_validate_utf8(myargv[1]);
-      myargv+=2;
-      myargc-=2;
-    } else if (!strcmp(myargv[0], "-m")) {
-      if (myargc<2) {
+  z->zwriteline = owl_argv_quote(argc, argv);
+
+  if (argc && *(argv[0])!='-') {
+    z->cmd=g_strdup(argv[0]);
+    argc--;
+    argv++;
+  }
+  while (argc) {
+    if (!strcmp(argv[0], "-c")) {
+      if (argc<2) {
+        badargs=1;
+        break;
+      }
+      z->class=owl_validate_utf8(argv[1]);
+      argv+=2;
+      argc-=2;
+    } else if (!strcmp(argv[0], "-i")) {
+      if (argc<2) {
+        badargs=1;
+        break;
+      }
+      z->inst=owl_validate_utf8(argv[1]);
+      argv+=2;
+      argc-=2;
+    } else if (!strcmp(argv[0], "-r")) {
+      if (argc<2) {
+        badargs=1;
+        break;
+      }
+      z->realm=owl_validate_utf8(argv[1]);
+      argv+=2;
+      argc-=2;
+    } else if (!strcmp(argv[0], "-s")) {
+      if (argc<2) {
+        badargs=1;
+        break;
+      }
+      z->zsig=owl_validate_utf8(argv[1]);
+      argv+=2;
+      argc-=2;
+    } else if (!strcmp(argv[0], "-O")) {
+      if (argc<2) {
+        badargs=1;
+        break;
+      }
+      z->opcode=owl_validate_utf8(argv[1]);
+      argv+=2;
+      argc-=2;
+    } else if (!strcmp(argv[0], "-m")) {
+      if (argc<2) {
         badargs=1;
         break;
@@ -99 +114 @@
 
       /* Once we have -m, gobble up everything else on the line */
-      myargv++;
-      myargc--;
-      msg = g_strjoinv(" ", (char**)myargv);
+      argv++;
+      argc--;
+      msg = g_strjoinv(" ", (char**)argv);
       break;
-    } else if (!strcmp(myargv[0], "-C")) {
+    } else if (!strcmp(argv[0], "-C")) {
       z->cc=1;
-      myargv++;
-      myargc--;
-    } else if (!strcmp(myargv[0], "-n")) {
+      argv++;
+      argc--;
+    } else if (!strcmp(argv[0], "-n")) {
       z->noping=1;
-      myargv++;
-      myargc--;
+      argv++;
+      argc--;
     } else {
       /* anything unattached is a recipient */
-      g_ptr_array_add(z->recips, owl_validate_utf8(myargv[0]));
-      myargv++;
-      myargc--;
+      g_ptr_array_add(z->recips, owl_validate_utf8(argv[0]));
+      argv++;
+      argc--;
     }
   }
-
-  g_strfreev(argv);
 
   if (badargs) {