Changeset 0504f63

Timestamp:

Aug 10, 2008, 5:38:44 PM (15 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:

e9bb404

Parents:

d81f8d0

Message:

Rewrite owl_filter_print to use GString.

barnowl will no longer segfault on `show filter' with filters over
5000 characters or so.

Files:

• filter.c (modified) (2 diffs)
• filterelement.c (modified) (2 diffs)
• functions.c (modified) (4 diffs)
• owl.h (modified) (1 diff)

filter.c

@@ -212 +212 @@
 
 
-void owl_filter_print(owl_filter *f, char *out)
-{
-  strcpy(out, owl_filter_get_name(f));
-  strcat(out, ": ");
+char* owl_filter_print(owl_filter *f)
+{
+  GString *out = g_string_new(owl_filter_get_name(f));
+
+  g_string_append(out, ": ");
 
   if (f->fgcolor!=OWL_COLOR_DEFAULT) {
-    strcat(out, "-c ");
+    g_string_append(out, "-c ");
     if (f->fgcolor < 8) {
-      strcat(out, owl_util_color_to_string(f->fgcolor));
+      g_string_append(out, owl_util_color_to_string(f->fgcolor));
     }
     else {
-      char* c = owl_sprintf("%i",f->fgcolor);
-      strcat(out, c);
-      owl_free(c);
-    }
-    strcat(out, " ");
+      g_string_append_printf(out, "%i",f->fgcolor);
+    }
+    g_string_append(out, " ");
   }
   if (f->bgcolor!=OWL_COLOR_DEFAULT) {
-    strcat(out, "-b ");
+    g_string_append(out, "-b ");
     if (f->bgcolor < 8) {
-      strcat(out, owl_util_color_to_string(f->bgcolor));
+      g_string_append(out, owl_util_color_to_string(f->bgcolor));
     }
     else {
-      char* c = owl_sprintf("%i",f->bgcolor);
-      strcat(out, c);
-      owl_free(c);
-    }
-    strcat(out, " ");
-  }
-  if(!f->root) return;
-  owl_filterelement_print(f->root, out);
-  strcat(out, "\n");
+      g_string_append_printf(out, "%i",f->fgcolor);
+    }
+    g_string_append(out, " ");
+  }
+  if(f->root) {
+    owl_filterelement_print(f->root, out);
+    g_string_append(out, "\n");
+  }
+
+  return g_string_free(out, 0);
 }
 
@@ -249 +249 @@
 int owl_filter_equiv(owl_filter *a, owl_filter *b)
 {
-  char buff[LINE], buff2[LINE];
-
-  owl_filter_print(a, buff);
-  owl_filter_print(b, buff2);
-
-  if (!strcmp(buff, buff2)) return(1);
-  return(0);
+  char *buffa, *buffb;
+  int ret;
+
+  buffa = owl_filter_print(a);
+  buffb = owl_filter_print(b);
+
+  ret = !strcmp(buffa, buffb);
+
+  owl_free(buffa);
+  owl_free(buffb);
+
+  return ret;
 }
 

filterelement.c

@@ -126 +126 @@
 /* Print methods */
 
-static void owl_filterelement_print_true(owl_filterelement *fe, char *buf)
-{
-  strcat(buf, "true");
-}
-
-static void owl_filterelement_print_false(owl_filterelement *fe, char *buf)
-{
-  strcat(buf, "false");
-}
-
-static void owl_filterelement_print_re(owl_filterelement *fe, char *buf)
+static void owl_filterelement_print_true(owl_filterelement *fe, GString *buf)
+{
+  g_string_append(buf, "true");
+}
+
+static void owl_filterelement_print_false(owl_filterelement *fe, GString *buf)
+{
+  g_string_append(buf, "false");
+}
+
+static void owl_filterelement_print_re(owl_filterelement *fe, GString *buf)
 {
   char *re, *q;
-  strcat(buf, fe->field);
-  strcat(buf, " ");
+  g_string_append(buf, fe->field);
+  g_string_append(buf, " ");
 
   re = owl_regex_get_string(&(fe->re));
   q = owl_getquoting(re);
-  strcat(buf, q);
-  strcat(buf, re); 
-  strcat(buf, q);
-}
-
-static void owl_filterelement_print_filter(owl_filterelement *fe, char *buf)
-{
-  strcat(buf, "filter ");
-  strcat(buf, fe->field);
-}
-
-static void owl_filterelement_print_perl(owl_filterelement *fe, char *buf)
-{
-  strcat(buf, "perl ");
-  strcat(buf, fe->field);
-}
-
-static void owl_filterelement_print_group(owl_filterelement *fe, char *buf)
-{
-  strcat(buf, "( ");
+  g_string_append(buf, q);
+  g_string_append(buf, re);
+  g_string_append(buf, q);
+}
+
+static void owl_filterelement_print_filter(owl_filterelement *fe, GString *buf)
+{
+  g_string_append(buf, "filter ");
+  g_string_append(buf, fe->field);
+}
+
+static void owl_filterelement_print_perl(owl_filterelement *fe, GString *buf)
+{
+  g_string_append(buf, "perl ");
+  g_string_append(buf, fe->field);
+}
+
+static void owl_filterelement_print_group(owl_filterelement *fe, GString *buf)
+{
+  g_string_append(buf, "( ");
   owl_filterelement_print(fe->left, buf) ;
-  strcat(buf, " )");
-}
-
-static void owl_filterelement_print_or(owl_filterelement *fe, char *buf)
+  g_string_append(buf, " )");
+}
+
+static void owl_filterelement_print_or(owl_filterelement *fe, GString *buf)
 {
   owl_filterelement_print(fe->left, buf);
-  strcat(buf, " or ");
+  g_string_append(buf, " or ");
   owl_filterelement_print(fe->right, buf);
 }
 
-static void owl_filterelement_print_and(owl_filterelement *fe, char *buf)
+static void owl_filterelement_print_and(owl_filterelement *fe, GString *buf)
 {
   owl_filterelement_print(fe->left, buf);
-  strcat(buf, " and ");
+  g_string_append(buf, " and ");
   owl_filterelement_print(fe->right, buf);
 }
 
-static void owl_filterelement_print_not(owl_filterelement *fe, char *buf)
-{
-  strcat(buf, " not ");
+static void owl_filterelement_print_not(owl_filterelement *fe, GString *buf)
+{
+  g_string_append(buf, " not ");
   owl_filterelement_print(fe->left, buf);
 }
@@ -321 +321 @@
 }
 
-void owl_filterelement_print(owl_filterelement *fe, char *buf)
+void owl_filterelement_print(owl_filterelement *fe, GString *buf)
 {
   if(!fe || !fe->print_elt) return;

functions.c

@@ -2515 +2515 @@
 {
   owl_filter *f;
-  char buff[5000];
+  char *buff;
 
   f=owl_global_get_filter(&g, name);
@@ -2522 +2522 @@
     return;
   }
-  owl_filter_print(f, buff);
+  buff = owl_filter_print(f);
   owl_function_popless_text(buff);
+  owl_free(buff);
 }
 
@@ -2531 +2532 @@
   owl_list *fl;
   char buff[5000];
+  char *tmp;
   owl_fmtext fm;
   int i, j;
@@ -2544 +2546 @@
     snprintf(buff, sizeof(buff), "[% 2d] ", i+1);
     owl_fmtext_append_normal(&fm, buff);
-    owl_filter_print(f, buff);
+    tmp = owl_filter_print(f);
+    owl_fmtext_append_normal(&fm, tmp);
+    owl_free(tmp);
     owl_fmtext_append_normal(&fm, buff);
   }

owl.h

@@ -406 +406 @@
   int (*match_message)(struct _owl_filterelement *fe, owl_message *m);
   /* Append a string representation of the filterelement onto buf*/
-  void (*print_elt)(struct _owl_filterelement *fe, char * buf);
+  void (*print_elt)(struct _owl_filterelement *fe, GString *buf);
   /* Operands for and,or,not*/
   struct _owl_filterelement *left, *right;