Changes in commands.c [697221f:c809f5e]

File:

• commands.c (modified) (7 diffs)

commands.c

@@ -281 +281 @@
   OWLCMD_ARGS("punt", owl_command_punt, OWL_CTX_ANY,
               "suppress an arbitrary filter",
-              "punt <filter-name>\n"
-              "punt <filter-text (multiple words)>",
+              "punt <filter-text>",
+              "punt <filter-text (multiple words)>\n"
               "The punt command will suppress messages to the specified\n"
               "filter\n\n"
@@ -289 +289 @@
   OWLCMD_ARGS("unpunt", owl_command_unpunt, OWL_CTX_ANY,
               "remove an entry from the punt list",
-              "unpunt <number>\n"
-              "unpunt <filter-name>\n"
-              "unpunt <filter-text (multiple words)>",
+              "unpunt <filter-text>\n"
+              "unpunt <filter-text>\n"
+              "unpunt <number>\n",
               "The unpunt command will remove an entry from the puntlist.\n"
-              "The last two forms correspond to the two forms of the :punt\n"
-              "command. The first allows you to remove a specific entry from\n"
+              "The first two forms correspond to the first two forms of the :punt\n"
+              "command. The latter allows you to remove a specific entry from the\n"
               "the list (see :show zpunts)\n\n"
               "SEE ALSO:  punt, zpunt, zunpunt, show zpunts\n"),
@@ -1288 +1288 @@
   }
   owl_function_nextmsg_full(filter, skip_deleted, last_if_none);
-  g_free(filter);
+  if (filter) g_free(filter);
   return(NULL);
 }
@@ -1318 +1318 @@
   }
   owl_function_prevmsg_full(filter, skip_deleted, first_if_none);
-  g_free(filter);
+  if (filter) g_free(filter);
   return(NULL);
 }
@@ -1691 +1691 @@
   commands = g_strsplit_set(newbuff, ";", 0);
   for (i = 0; commands[i] != NULL; i++) {
-    g_free(lastrv);
+    if (lastrv) {
+      g_free(lastrv);
+    }
     lastrv = owl_function_command(commands[i]);
   }
@@ -2464 +2466 @@
   owl_list * fl;
   owl_filter * f;
+  char * text;
   int i;
 
@@ -2479 +2482 @@
         return;
       } else {
-        owl_function_makemsg("No such filter number: %d.", i+1);
+        owl_function_error("No such filter number: %d", i+1);
       }
     }
-    const char *filter[] = {"filter", argv[1]};
-    owl_function_punt(2, filter, unpunt);
+    text = owl_string_build_quoted("filter %q", argv[1]);
+    owl_function_punt(text, unpunt);
+    g_free(text);
   } else {
-    /* Pass in argv[1]..argv[argc-1]. */
-    owl_function_punt(argc - 1, argv + 1, unpunt);
+    owl_function_punt(skiptokens(buff, 1), unpunt);
   }
 }