Changeset cdc6ff1

Timestamp:

Aug 22, 2008, 12:22:37 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

da466e0

Parents:

680ada9

Message:

Implement a getfilter command to get the text of a filter.

Files:

• commands.c (modified) (2 diffs)
• filter.c (modified) (2 diffs)
• functions.c (modified) (2 diffs)

commands.c

@@ -712 +712 @@
               "returns the value of a variable",
               "getvar <varname>", ""),
+
+  OWLCMD_ARGS("getfilter", owl_command_getfilter, OWL_CTX_INTERACTIVE,
+              "returns the definition of a filter",
+              "getfilter <filtername>", ""),
 
   OWLCMD_ARGS("getstyle", owl_command_getstyle, OWL_CTX_INTERACTIVE,
@@ -2461 +2465 @@
 }
 
+char *owl_command_getfilter(int argc, char **argv, char *buf)
+{
+  owl_filter *f;
+  if (argc != 2) {
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+    return NULL;
+  }
+  f = owl_global_get_filter(&g, argv[1]);
+  if (!f) {
+    return NULL;
+  }
+  return owl_filter_print(f);
+}
+
 char *owl_command_search(int argc, char **argv, char *buff)
 {

filter.c

@@ -214 +214 @@
 char* owl_filter_print(owl_filter *f)
 {
-  GString *out = g_string_new(owl_filter_get_name(f));
-
-  g_string_append(out, ": ");
+  GString *out = g_string_new("");
 
   if (f->fgcolor!=OWL_COLOR_DEFAULT) {
@@ -256 +254 @@
 
   ret = !strcmp(buffa, buffb);
+  ret = ret && !strcmp(owl_filter_get_name(a),
+                       owl_filter_get_name(b));
 
   owl_free(buffa);

functions.c

@@ -2524 +2524 @@
 {
   owl_filter *f;
-  char *buff;
+  char *buff, *tmp;
 
   f=owl_global_get_filter(&g, name);
@@ -2531 +2531 @@
     return;
   }
-  buff = owl_filter_print(f);
+  tmp = owl_filter_print(f);
+  buff = owl_sprintf("%s: %s", owl_filter_get_name(f), tmp);
   owl_function_popless_text(buff);
   owl_free(buff);
+  owl_free(tmp);
 }