Changeset a52d13a

Timestamp:

Jul 15, 2009, 11:39:02 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

130633c

Parents:

3e8ff1e

Message:

zephyr: Expand tabs in outgoing messages.

While we're at it, refactor owl_zwrite_create_from_line slightly in a
way that fixes 'zwrite -C user1 user2 -m message' to include the CC:
line.

File:

• zwrite.c (modified) (5 diffs)

zwrite.c

@@ -9 +9 @@
 int owl_zwrite_create_from_line(owl_zwrite *z, char *line)
 {
-  int argc, badargs, myargc;
+  int argc, badargs, myargc, i, len;
   char **argv, **myargv;
+  char *msg = NULL;
 
   badargs=0;
@@ -91 +92 @@
       myargv++;
       myargc--;
-      z->message = owl_strdup("");
+      len = 0;
+      for (i=0;i<myargc;i++) {
+        len += strlen(myargv[i-1]) + 1;
+      }
+      msg = owl_malloc(len);
+      msg[0] = '\0';
       while (myargc) {
-        z->message=owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
-        strcat(z->message, myargv[0]);
-        strcat(z->message, " ");
-        myargc--;
-        myargv++;
-      }
-      z->message[strlen(z->message)-1]='\0'; /* remove last space */
+        strcat(msg, myargv[0]);
+        strcat(msg, " ");
+        myargc--;
+        myargv++;
+      }
+      msg[strlen(msg)-1] = '\0';
       break;
     } else if (!strcmp(myargv[0], "-C")) {
@@ -136 +141 @@
   if (z->opcode==NULL) z->opcode=owl_strdup("");
   /* z->message is allowed to stay NULL */
-  
+
+  if(msg) {
+    owl_zwrite_set_message(z, msg);
+    owl_free(msg);
+  }
+
   return(0);
 }
@@ -222 +232 @@
   int i, j;
   char *toline = NULL;
-  char *tmp = NULL;
+  char *tmp = NULL, *tmp2;
 
   if (z->message) owl_free(z->message);
@@ -240 +250 @@
     }
     tmp = owl_validate_utf8(msg);
-    z->message=owl_sprintf("%s\n%s", toline, tmp);
+    tmp2 = owl_text_expand_tabs(tmp);
+    z->message=owl_sprintf("%s\n%s", toline, tmp2);
     owl_free(toline);
+    owl_free(tmp);
+    owl_free(tmp2);
   } else {
-    z->message=owl_validate_utf8(msg);
-  }
-  if (tmp) owl_free(tmp);
+    tmp=owl_validate_utf8(msg);
+    z->message=owl_text_expand_tabs(tmp);
+    owl_free(tmp);
+  }
 }