Changeset 2315 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-string.c

Timestamp:

Aug 18, 2009, 2:29:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3326@localhost: bruno | 2009-08-01 23:53:09 +0200
resolve_naff_tokens now returns an allocated char

File:

• branches/2.2.10/mondo/src/common/libmondo-string.c (modified) (2 diffs)

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -501 +501 @@
 /**
  * Replace all occurences of @p token with @p value while copying @p ip to @p output.
- * @param ip The input string containing zero or more <tt>token</tt>s.
+ * @param ip The input string containing zero or more <tt>token</tt>s. The string will be altered by this function
  * @param output The output string written with the <tt>token</tt>s replaced by @p value.
  * @param token The token to be relaced with @p value.
  * @param value The value to replace @p token.
  */
-void resolve_naff_tokens(char *output, char *ip, char *value, char *token)
+char *resolve_naff_tokens(char *ip, char *value, char *token)
 {
     /*@ buffers *** */
-    char *input;
+    char *output = NULL;
 
     /*@ pointers * */
-    char *p;
-
-    input = malloc(2000);
-    // BERLIOS: seems to cause invalid errors 
-    //assert_string_is_neither_NULL_nor_zerolength(ip);
+    char *p = NULL; /* points to token to modify */
+    char *q = NULL; /* points to start of string/new string */
+
     assert_string_is_neither_NULL_nor_zerolength(token);
     assert(value != NULL);
 
-    strcpy(output, ip);         /* just in case the token doesn't appear in string at all */
-    for (strcpy(input, ip); strstr(input, token); strcpy(input, output)) {
-        strcpy(output, input);
-        p = strstr(output, token);
+    q = ip;
+    while ((p = strstr(q, token) != NULL)) {
         *p = '\0';
-        strcat(output, value);
-        p = strstr(input, token) + strlen(token);
-        strcat(output, p);
-    }
-    paranoid_free(input);
+        if (output) {
+            mr_strcat(output, "%s%s", q, value);
+        } else {
+            mr_asprintf(&output, "%s%s", q, value);
+        }
+        p++;
+        q = p;
+    }
+    if (output) {
+        mr_strcat(output, "%s", q);
+    } else {
+        /* just in case the token doesn't appear in string at all */
+        mr_asprintf(&output, "%s", q);
+    }
+    return(output);
 }
 
@@ -1085 +1091 @@
     /*@ int *********************************************** */
     int percentage;
+    int j;
 
     /*@ buffers ******************************************* */