Changeset 2bc6ad35

Timestamp:

Jan 2, 2011, 3:35:15 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

d222c44

Parents:

d275eb2

git-author:

David Benjamin <davidben@mit.edu> (12/14/10 23:52:42)

git-committer:

David Benjamin <davidben@mit.edu> (01/02/11 15:35:15)

Message:

Add owl_quote_arg and owl_string_append_quoted_arg

Also add unit tests. We don't appear to have an equivalent of
BarnOwl::quote in C that actually works.

Files:

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

tester.c

@@ -175 +175 @@
   FAIL_UNLESS("skiptokens 5",
               !strcmp("c d e", skiptokens("a \"'\" c d e", 2)));
+
+#define CHECK_QUOTING(desc, unquoted, quoted)           \
+  do {                                                  \
+      int __argc;                                       \
+      char *__quoted = owl_arg_quote(unquoted);         \
+      char **__argv;                                    \
+      FAIL_UNLESS(desc, !strcmp(quoted, __quoted));     \
+      __argv = owl_parseline(__quoted, &__argc);        \
+      FAIL_UNLESS(desc " - arg count", __argc == 1);    \
+      FAIL_UNLESS(desc " - parsed",                     \
+                  !strcmp(__argv[0], unquoted));        \
+      owl_parse_delete(__argv, __argc);                 \
+      owl_free(__quoted);                               \
+    } while (0)
+
+  CHECK_QUOTING("boring text", "mango", "mango");
+  CHECK_QUOTING("spaces", "mangos are tasty", "'mangos are tasty'");
+  CHECK_QUOTING("single quotes", "mango's", "\"mango's\"");
+  CHECK_QUOTING("double quotes", "he said \"mangos are tasty\"",
+                "'he said \"mangos are tasty\"'");
+  CHECK_QUOTING("both quotes",
+                "he said \"mango's are tasty even when you put in "
+                "a random apostrophe\"",
+                "\"he said \"'\"'\"mango's are tasty even when you put in "
+                "a random apostrophe\"'\"'\"\"");
+  CHECK_QUOTING("quote monster", "'\"\"'\"'''\"",
+                "\""
+                "'"
+                "\"'\"'\""
+                "\"'\"'\""
+                "'"
+                "\"'\"'\""
+                "'"
+                "'"
+                "'"
+                "\"'\"'\""
+                "\"");
 
   /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */

util.c

@@ -194 +194 @@
 }
 
+/* Appends a quoted version of arg suitable for placing in a
+ * command-line to a GString. Does not append a space. */
+void owl_string_append_quoted_arg(GString *buf, const char *arg)
+{
+  const char *argp;
+  if (arg[0] == '\0') {
+    /* Quote the empty string. */
+    g_string_append(buf, "''");
+  } else if (arg[strcspn(arg, "'\" \n\t")] == '\0') {
+    /* If there are no nasty characters, return as-is. */
+    g_string_append(buf, arg);
+  } else if (!strchr(arg, '\'')) {
+    /* Single-quote if possible. */
+    g_string_append_c(buf, '\'');
+    g_string_append(buf, arg);
+    g_string_append_c(buf, '\'');
+  } else {
+    /* Nasty case: double-quote, but change all internal "s to "'"'"
+     * so that they are single-quoted because we're too cool for
+     * backslashes.
+     */
+    g_string_append_c(buf, '"');
+    for (argp = arg; *argp; argp++) {
+      if (*argp == '"')
+        g_string_append(buf, "\"'\"'\"");
+      else
+        g_string_append_c(buf, *argp);
+    }
+    g_string_append_c(buf, '"');
+  }
+}
+
+/* Returns a quoted version of arg suitable for placing in a
+ * command-line. Result should be freed with owl_free. */
+char *owl_arg_quote(const char *arg)
+{
+  GString *buf = g_string_new("");;
+  owl_string_append_quoted_arg(buf, arg);
+  return g_string_free(buf, false);
+}
+
 /* caller must free the return */
 char *owl_util_minutes_to_timestr(int in)