Changeset 42ee1be

Timestamp:

Mar 24, 2011, 12:48:25 AM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

e56303f

Parents:

4479497

git-author:

Anders Kaseorg <andersk@mit.edu> (02/12/11 00:04:30)

git-committer:

Anders Kaseorg <andersk@mit.edu> (03/24/11 00:48:25)

Message:

Reimplement owl_text_substitute with g_strsplit and g_strjoinv

(I have no idea what the rambling about backslash quoting was about.)

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: David Benjamin <davidben@mit.edu>

Files:

• tester.c (modified) (1 diff)
• text.c (modified) (1 diff)

tester.c

@@ -137 +137 @@
     } while (0)
 
-  CHECK_STR_AND_FREE("owl_util_substitute 1", "foo",
-                     owl_text_substitute("foo", "", "Y"));
   CHECK_STR_AND_FREE("owl_text_substitute 2", "fYZYZ",
                      owl_text_substitute("foo", "o", "YZ"));

text.c

@@ -267 +267 @@
 
 /* Return a string with any occurances of 'from' replaced with 'to'.
- * Does not currently handle backslash quoting, but may in the future.
  * Caller must free returned string.
  */
 char *owl_text_substitute(const char *in, const char *from, const char *to)
 {
-  
-  char *out;
-  int   outlen, tolen, fromlen, inpos=0, outpos=0;
-
-  if (!*from) return g_strdup(in);
-
-  outlen = strlen(in)+1;
-  tolen  = strlen(to);
-  fromlen  = strlen(from);
-  out = g_new(char, outlen);
-
-  while (in[inpos]) {
-    if (!strncmp(in+inpos, from, fromlen)) {
-      outlen += tolen;
-      out = g_renew(char, out, outlen);
-      strcpy(out+outpos, to);
-      inpos += fromlen;
-      outpos += tolen;
-    } else {
-      out[outpos] = in[inpos];
-      inpos++; outpos++;
-    }
-  }
-  out[outpos] = '\0';
-  return(out);
+  char **split = g_strsplit(in, from, 0), *out;
+  out = g_strjoinv(to, split);
+  g_strfreev(split);
+  return out;
 }