Changes in functions.c [259e60a8:1081d0f]

File:

• functions.c (modified) (12 diffs)

functions.c

@@ -32 +32 @@
   char *rv;
   rv=owl_function_command(cmdbuff);
-  g_free(rv);
+  if (rv) g_free(rv);
 }
 
@@ -453 +453 @@
 
   if (rv || status) {
-    g_free(cryptmsg);
+    if(cryptmsg) g_free(cryptmsg);
     g_free(old_msg);
     owl_function_error("Error in zcrypt, possibly no key found.  Message not sent.");
@@ -991 +991 @@
   /* execute the commands in shutdown */
   ret = owl_perlconfig_execute("BarnOwl::Hooks::_shutdown();");
-  g_free(ret);
+  if (ret) g_free(ret);
 
   /* signal our child process, if any */
@@ -2347 +2347 @@
 done:
   g_free(class);
-  g_free(instance);
+  if (instance) {
+    g_free(instance);
+  }
   return(filtname);
 }
@@ -2770 +2772 @@
 void owl_function_zpunt(const char *class, const char *inst, const char *recip, int direction)
 {
-  GPtrArray *argv;
+  GString *buf;
   char *quoted;
 
-  argv = g_ptr_array_new();
+  buf = g_string_new("");
   if (!strcmp(class, "*")) {
-    g_ptr_array_add(argv, g_strdup("class"));
-    g_ptr_array_add(argv, g_strdup(".*"));
+    g_string_append(buf, "class .*");
   } else {
     quoted=owl_text_quote(class, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-    g_ptr_array_add(argv, g_strdup("class"));
-    g_ptr_array_add(argv, g_strdup_printf("^(un)*%s(\\.d)*$", quoted));
+    owl_string_appendf_quoted(buf, "class ^(un)*%q(\\.d)*$", quoted);
     g_free(quoted);
   }
   if (!strcmp(inst, "*")) {
-    g_ptr_array_add(argv, g_strdup("and"));
-    g_ptr_array_add(argv, g_strdup("instance"));
-    g_ptr_array_add(argv, g_strdup(".*"));
+    g_string_append(buf, " and instance .*");
   } else {
     quoted=owl_text_quote(inst, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-    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));
+    owl_string_appendf_quoted(buf, " and instance ^(un)*%q(\\.d)*$", quoted);
     g_free(quoted);
   }
   if (!strcmp(recip, "*")) {
-    /* nothing */
+    /* g_string_append(buf, ""); */
   } else {
     if(!strcmp(recip, "%me%")) {
@@ -2801 +2797 @@
     }
     quoted=owl_text_quote(recip, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-    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));
+    owl_string_appendf_quoted(buf, " and recipient ^%q$", quoted);
     g_free(quoted);
   }
 
-  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_function_punt(buf->str, direction);
+  g_string_free(buf, true);
+}
+
+void owl_function_punt(const char *filter, int direction)
 {
   owl_filter *f;
@@ -2820 +2813 @@
 
   /* first, create the filter */
-  f = owl_filter_new("punt-filter", argc, argv);
+  owl_function_debugmsg("About to filter %s", filter);
+  f = owl_filter_new_fromstring("punt-filter", filter);
   if (f == NULL) {
     owl_function_error("Error creating filter for zpunt");
@@ -2847 +2841 @@
   }
 
-  if (direction == 0) {
-    owl_function_debugmsg("punting");
-    /* If we're punting, add the filter to the global punt list */
+  owl_function_debugmsg("punting");
+  /* If we're punting, add the filter to the global punt list */
+  if (direction==0) {
     owl_list_append_element(fl, f);
-  } else if (direction == 1) {
-    owl_function_makemsg("No matching punt filter");
- }
+  }
 }
 
@@ -2990 +2982 @@
       i--;
     }
-    if (owl_global_take_interrupt(&g)) {
+    owl_function_mask_sigint(NULL);
+    if(owl_global_is_interrupted(&g)) {
+      owl_global_unset_interrupted(&g);
+      owl_function_unmask_sigint(NULL);
       owl_function_makemsg("Search interrupted!");
       owl_mainwin_redisplay(owl_global_get_mainwin(&g));
       return;
     }
+    owl_function_unmask_sigint(NULL);
   }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
@@ -3077 +3073 @@
           ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
 
-          if (owl_global_take_interrupt(&g)) {
+          owl_function_mask_sigint(NULL);
+          if(owl_global_is_interrupted(&g)) {
             interrupted = 1;
+            owl_global_unset_interrupted(&g);
+            owl_function_unmask_sigint(NULL);
             owl_function_makemsg("Interrupted!");
             break;
           }
+
+          owl_function_unmask_sigint(NULL);
 
           if (ret!=ZERR_NONE) {
@@ -3242 +3243 @@
   filename=owl_global_get_startupfile(&g);
 
-  /* delete earlier copies, if the file exists */
-  if (g_file_test(filename, G_FILE_TEST_EXISTS))
-    owl_util_file_deleteline(filename, buff, 1);
+  /* delete earlier copies */
+  owl_util_file_deleteline(filename, buff, 1);
 
   file=fopen(filename, "a");
@@ -3487 +3487 @@
 }
 
+void owl_function_mask_sigint(sigset_t *oldmask) {
+  sigset_t intr;
+
+  sigemptyset(&intr);
+  sigaddset(&intr, SIGINT);
+  sigprocmask(SIG_BLOCK, &intr, oldmask);
+}
+
+void owl_function_unmask_sigint(sigset_t *oldmask) {
+  sigset_t intr;
+
+  sigemptyset(&intr);
+  sigaddset(&intr, SIGINT);
+  sigprocmask(SIG_UNBLOCK, &intr, oldmask);
+}
+
 void _owl_function_mark_message(const owl_message *m)
 {