Changeset e50cd56 for util.c

Timestamp:

Jul 11, 2002, 12:47:16 AM (22 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

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

Children:

aa2f33b3

Parents:

e173507

Message:

Fixed some buffer overruns in the "reply" command.
When repying to "all" on a message that begins with "CC:" (eg, sent
         with "zwrite -C", the reply line will be constructed
         from the sender and the usernames on the CC: line
         of the message being replied to.
There is no such thing as C-R, so left C-r as it is but added:
         M-r --- edit reply to all
         M-R --- edit reply to sender

File:

• util.c (modified) (2 diffs)

util.c

@@ -298 +298 @@
   return(ret);
 }
+
+/* Caller must free response. 
+   Takes in strings which are space-separated lists of tokens
+   and returns a single string containing no token more than once.
+   If prohibit is non-null, no token may start with a character
+   in prohibit.
+*/
+char *owl_util_uniq(char *A, char *B, char *prohibit) {
+  char *cat, **tok;
+  int toklen, i, j, first=1;
+  cat = owl_malloc(strlen(A)+strlen(B)+3);
+  strcpy(cat, A);
+  strcat(cat, " ");
+  strcat(cat, B);
+  tok = atokenize(cat, " ", &toklen);
+  strcpy(cat, "");
+  for (i=0; i<toklen; i++) {
+    int dup=0;
+    for (j=0; j<i; j++) {
+      if (!strcmp(tok[i], tok[j])) dup=1;
+    }
+    if (!dup && (!prohibit || !strchr(prohibit, tok[i][0]))) {
+      if (!first) {
+        strcat(cat, " ");
+      }
+      first=0;
+      strcat(cat, tok[i]);
+    }
+  }
+  atokenize_free(tok, toklen);
+  return(cat);
+}
+
+
 
 /* returns if a string is only whitespace */
@@ -482 +516 @@
               !strcmp("meep", skiptokens("foo 'bar quux' meep", 2)));
 
+  FAIL_UNLESS("owl_util_uniq 1", 
+              !strcmp("foo bar x", owl_util_uniq("foo", "bar x", "-")));
+  FAIL_UNLESS("owl_util_uniq 2", 
+              !strcmp("foo bar x", owl_util_uniq("foo", "bar -y x", "-")));
+  FAIL_UNLESS("owl_util_uniq 3", 
+              !strcmp("meep foo bar", owl_util_uniq("meep foo", "bar foo meep", "-")));
+
   if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
   printf("END testing owl_util (%d failures)\n", numfailed);