Changeset 78f6c35 for functions.c

Timestamp:

May 24, 2011, 9:36:28 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

697221f

Parents:

2d415cc

git-author:

David Benjamin <davidben@mit.edu> (04/04/11 01:27:16)

git-committer:

David Benjamin <davidben@mit.edu> (05/24/11 21:36:28)

Message:

Don't use skiptokens in punt/unpunt

There was no need for it. This cuts down on one of the more nasty usages
of skiptokens in command parsing.

File:

• functions.c (modified) (3 diffs)

functions.c

@@ -2781 +2781 @@
 void owl_function_zpunt(const char *class, const char *inst, const char *recip, int direction)
 {
-  GString *buf;
+  GPtrArray *argv;
   char *quoted;
 
-  buf = g_string_new("");
+  argv = g_ptr_array_new();
   if (!strcmp(class, "*")) {
-    g_string_append(buf, "class .*");
+    g_ptr_array_add(argv, g_strdup("class"));
+    g_ptr_array_add(argv, g_strdup(".*"));
   } else {
     quoted=owl_text_quote(class, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-    owl_string_appendf_quoted(buf, "class ^(un)*%q(\\.d)*$", quoted);
+    g_ptr_array_add(argv, g_strdup("class"));
+    g_ptr_array_add(argv, g_strdup_printf("^(un)*%s(\\.d)*$", quoted));
     g_free(quoted);
   }
   if (!strcmp(inst, "*")) {
-    g_string_append(buf, " and instance .*");
+    g_ptr_array_add(argv, g_strdup("and"));
+    g_ptr_array_add(argv, g_strdup("instance"));
+    g_ptr_array_add(argv, g_strdup(".*"));
   } else {
     quoted=owl_text_quote(inst, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-    owl_string_appendf_quoted(buf, " and instance ^(un)*%q(\\.d)*$", quoted);
+    g_ptr_array_add(argv, g_strdup("and"));
+    g_ptr_array_add(argv, g_strdup("instance"));
+    g_ptr_array_add(argv, g_strdup_printf("^(un)*%s(\\.d)*$", quoted));
     g_free(quoted);
   }
   if (!strcmp(recip, "*")) {
-    /* g_string_append(buf, ""); */
+    /* nothing */
   } else {
     if(!strcmp(recip, "%me%")) {
@@ -2806 +2812 @@
     }
     quoted=owl_text_quote(recip, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-    owl_string_appendf_quoted(buf, " and recipient ^%q$", quoted);
+    g_ptr_array_add(argv, g_strdup("and"));
+    g_ptr_array_add(argv, g_strdup("recipient"));
+    g_ptr_array_add(argv, g_strdup_printf("^%s$", quoted));
     g_free(quoted);
   }
 
-  owl_function_punt(buf->str, direction);
-  g_string_free(buf, true);
-}
-
-void owl_function_punt(const char *filter, int direction)
+  owl_function_punt(argv->len, (const char *const*) argv->pdata, direction);
+  g_ptr_array_foreach(argv, (GFunc)g_free, NULL);
+  g_ptr_array_free(argv, true);
+}
+
+void owl_function_punt(int argc, const char *const *argv, int direction)
 {
   owl_filter *f;
@@ -2822 +2831 @@
 
   /* first, create the filter */
-  owl_function_debugmsg("About to filter %s", filter);
-  f = owl_filter_new_fromstring("punt-filter", filter);
+  f = owl_filter_new("punt-filter", argc, argv);
   if (f == NULL) {
     owl_function_error("Error creating filter for zpunt");