Changeset e1c4636 for util.c

Timestamp:

Jul 9, 2002, 12:04:35 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:

2c8a07c

Parents:

10b866d

Message:

* Added owl::send_zwrite(command, message) to the perl glue
         to allow for the direct sending of multi-line messages.
         For example:  owl::send_zwrite("-c foo -i bar", "hello");
* Reverted attempted fix for the pagedown problem
         which just made things worse.
* Changed owl_fmtext_print_plain to return an alloc'd string to
         avoid buffer overrun risks.
* Added owl::ztext_stylestrip("...") function to perlglue
          which returns the ztext with formatting stripped out.
* Added colorztext variable which can be used to disable @color()
          strings arriving in messages after it is set.
          (Currently, changing its value won't reformat messages).
* Outgoing zephyr logging now obeys the logpath variable.
* The '~' character in logpath and classlogpath now gets
          replaced with the user's home directory.

File:

• util.c (modified) (4 diffs)

util.c

@@ -148 +148 @@
 
 /* skips n tokens and returns where that would be.
- * TODO: handle quotes. */
+ * TODO: handle quotes more sanely. */
 char *skiptokens(char *buff, int n) {
   int inquotes=0;
@@ -154 +154 @@
       while (*buff == ' ') buff++;
       while (*buff && (inquotes || *buff != ' ')) { 
-        if (*buff == '"') inquotes=!inquotes;
+        if (*buff == '"' || *buff == '\'') inquotes=!inquotes;
         buff++;
       }
@@ -386 +386 @@
 }
 
+/* Caller must free returned string.
+ * Returns a string with any occurances of 'from' replaced with 'to'.
+ * Does not currently handle backslash quoting, but may in the future.
+ */
+char *owl_util_substitute(char *in, char *from, char *to) {
+  char *out;
+  int   outlen, tolen, fromlen, inpos=0, outpos=0;
+
+  if (!*from) return owl_strdup(in);
+
+  outlen = strlen(in)+1;
+  tolen  = strlen(to);
+  fromlen  = strlen(from);
+  out = malloc(outlen);
+
+  while (in[inpos]) {
+    if (!strncmp(in+inpos, from, fromlen)) {
+      outlen += tolen;
+      out = owl_realloc(out, outlen);
+      strcpy(out+outpos, to);
+      inpos += fromlen;
+      outpos += tolen;
+    } else {
+      out[outpos] = in[inpos];
+      inpos++; outpos++;
+    }
+  }
+  out[outpos] = '\0';
+  return(out);
+}
+
 
 int owl_util_string_to_color(char *color) {
@@ -422 +453 @@
   return("Unknown color");
 }
+
+
+/**************************************************************************/
+/************************* REGRESSION TESTS *******************************/
+/**************************************************************************/
+
+#ifdef OWL_INCLUDE_REG_TESTS
+
+#define FAIL_UNLESS(desc,pred) printf("\t%-4s: %s\n", (pred)?"ok":(numfailed++,"FAIL"), desc)
+
+int owl_util_regtest(void) {
+  int numfailed=0;
+
+  printf("BEGIN testing owl_util\n");
+
+  FAIL_UNLESS("owl_util_substitute 1",
+              !strcmp("foo", owl_util_substitute("foo", "", "Y")));
+  FAIL_UNLESS("owl_util_substitute 2",
+              !strcmp("fYZYZ", owl_util_substitute("foo", "o", "YZ")));
+  FAIL_UNLESS("owl_util_substitute 3",
+              !strcmp("foo", owl_util_substitute("fYZYZ", "YZ", "o")));
+  FAIL_UNLESS("owl_util_substitute 4",
+              !strcmp("/u/foo/meep", owl_util_substitute("~/meep", "~", "/u/foo")));
+
+  FAIL_UNLESS("skiptokens 1", 
+              !strcmp("bar quux", skiptokens("foo bar quux", 1)));
+  FAIL_UNLESS("skiptokens 2", 
+              !strcmp("meep", skiptokens("foo 'bar quux' meep", 2)));
+
+  if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
+  printf("END testing owl_util (%d failures)\n", numfailed);
+  return(numfailed);
+}
+
+#endif /* OWL_INCLUDE_REG_TESTS */