Changeset d6c2e03

Timestamp:

Sep 30, 2011, 9:32:19 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

2dd9c48

Parents:

7b89e8c

git-author:

David Benjamin <davidben@mit.edu> (09/30/11 20:48:57)

git-committer:

David Benjamin <davidben@mit.edu> (09/30/11 21:32:19)

Message:

Allow building a zwrite from an argv

Add new versions of owl_zwrite_create and owl_zwrite_new. Note that this
means we rebuild z->zwriteline from scratch unconditionally. The only
behavior change is that the user's spacing and quoting is not preserved
in zwrite locktext.  For instance

  :zwrite     davidben       -i   "spaces yay?"

now gets a locktext of

  ----> zwrite davidben -i 'spaces yay?'

I think this isn't a big deal. It already happens for every other *write
locktext, and if we kill the buff argument, it'll happen there too.

File:

• zwrite.c (modified) (3 diffs)

zwrite.c

@@ -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;
+  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, myargc;
   const char *const *myargv;
   char *msg = NULL;
@@ -31 +57 @@
   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;
+  z->zwriteline = owl_argv_quote(argc, argv);
+
+  myargc = argc;
+  myargv = argv;
   if (myargc && *(myargv[0])!='-') {
     z->cmd=g_strdup(myargv[0]);
@@ -119 +139 @@
   }
 
-  g_strfreev(argv);
-
   if (badargs) {
     return(-1);