Changeset f47696f

Timestamp:

Jan 20, 2011, 7:59:38 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c426bc2

Parents:

443dcfa

git-author:

Nelson Elhage <nelhage@mit.edu> (01/03/11 21:18:17)

git-committer:

David Benjamin <davidben@mit.edu> (01/20/11 19:59:38)

Message:

Add owl_string_appendf_quoted for easy construction of command lines.

Files:

• tester.c (modified) (1 diff)
• util.c (modified) (2 diffs)

tester.c

@@ -215 +215 @@
                 "\"");
 
+  GString *g = g_string_new("");
+  owl_string_appendf_quoted(g, "%q foo %q%q %s %", "hello", "world is", "can't");
+  FAIL_UNLESS("owl_string_appendf",
+              !strcmp(g_string_free(g, false),
+                      "hello foo 'world is'\"can't\" %s %"));
+
   /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */
   printf("# END testing owl_util (%d failures)\n", numfailed);

util.c

@@ -8 +8 @@
 #include <sys/types.h>
 #include <assert.h>
+#include <stdarg.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -226 +227 @@
 }
 
+/*
+ * Appends 'tmpl' to 'buf', replacing any instances of '%q' with arguments from
+ * the varargs provided, quoting them to be safe for placing in a barnowl
+ * command line.
+ */
+void owl_string_appendf_quoted(GString *buf, const char *tmpl, ...)
+{
+  va_list ap;
+  va_start(ap, tmpl);
+  owl_string_vappendf_quoted(buf, tmpl, ap);
+  va_end(ap);
+}
+
+void owl_string_vappendf_quoted(GString *buf, const char *tmpl, va_list ap)
+{
+  const char *p = tmpl, *last = tmpl;
+  while (true) {
+    p = strchr(p, '%');
+    if (p == NULL) break;
+    if (*(p+1) != 'q') {
+      p++;
+      if (*p) p++;
+      continue;
+    }
+    g_string_append_len(buf, last, p - last);
+    owl_string_append_quoted_arg(buf, va_arg(ap, char *));
+    p += 2; last = p;
+  }
+
+  g_string_append(buf, last);
+}
+
+char *owl_string_build_quoted(const char *tmpl, ...)
+{
+  GString *buf = g_string_new("");
+  va_list ap;
+  va_start(ap, tmpl);
+  owl_string_vappendf_quoted(buf, tmpl, ap);
+  va_end(ap);
+  return g_string_free(buf, false);  
+}
+
 /* Returns a quoted version of arg suitable for placing in a
  * command-line. Result should be freed with owl_free. */