Changeset 259e60a8

Timestamp:

May 30, 2011, 7:46:21 PM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

44976fe, 9835b7a

Parents:

8ffa264

git-author:

Jason Gross <jgross@mit.edu> (05/18/11 16:25:58)

git-committer:

Anders Kaseorg <andersk@mit.edu> (05/30/11 19:46:21)

Message:

Remove the length limit on field values in :info

Files:

• functions.c (modified) (2 diffs)
• message.c (modified) (2 diffs)

functions.c

@@ -1408 +1408 @@
 #ifdef HAVE_LIBZEPHYR
     if (owl_message_is_direction_in(m)) {
-      char *ptr, tmpbuff[1024];
-      int i, j, fields, len;
+      char *tmpbuff;
+      int i, fields;
 
       n=owl_message_get_notice(m);
@@ -1453 +1453 @@
         owl_fmtext_appendf_normal(&fm, "  Fields    : %i\n", fields);
 
-        for (i=0; i<fields; i++) {
-          ptr=owl_zephyr_get_field_as_utf8(n, i+1);
-          len=strlen(ptr);
-          if (len<30) {
-            strncpy(tmpbuff, ptr, len);
-            tmpbuff[len]='\0';
-          } else {
-            strncpy(tmpbuff, ptr, 30);
-            tmpbuff[30]='\0';
-            strcat(tmpbuff, "...");
-          }
-          g_free(ptr);
-
-          for (j=0; j<strlen(tmpbuff); j++) {
-            if (tmpbuff[j]=='\n') tmpbuff[j]='~';
-            if (tmpbuff[j]=='\r') tmpbuff[j]='!';
-          }
-
-          owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i+1, tmpbuff);
+        for (i = 0; i < fields; i++) {
+          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
+
+          g_strdelimit(tmpbuff, "\n", '~');
+          g_strdelimit(tmpbuff, "\r", '!');
+
+          owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i + 1, tmpbuff);
+          g_free(tmpbuff);
         }
         owl_fmtext_appendf_normal(&fm, "  Default Fm: %s\n", n->z_default_format);

message.c

@@ -120 +120 @@
   int i, j;
   owl_pair *p;
-  char *buff;
+  char *buff, *tmpbuff;
 
   owl_fmtext_init_null(fm);
@@ -127 +127 @@
   for (i=0; i<j; i++) {
     p=owl_list_get_element(&(m->attributes), i);
-    buff=g_strdup_printf("  %-15.15s: %-35.35s\n", owl_pair_get_key(p), owl_pair_get_value(p));
+
+    tmpbuff = g_strdup(owl_pair_get_value(p));
+    g_strdelimit(tmpbuff, "\n", '~');
+    g_strdelimit(tmpbuff, "\r", '!');
+    buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
+    g_free(tmpbuff);
+
     if(buff == NULL) {
-      buff=g_strdup_printf("  %-15.15s: %-35.35s\n", owl_pair_get_key(p), "<error>");
+      buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), "<error>");
       if(buff == NULL)
         buff=g_strdup("   <error>\n");