Changeset 2315 in MondoRescue

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

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-fork.c (modified) (5 diffs)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (2 diffs)
• libmondo-string.h (modified) (1 diff)

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

@@ -101 +101 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp, *incoming, *old_stderr; 
+    char *midway_call = NULL;
+    char *ultimate_call = NULL;
+    char *tmp = NULL;
+    char *incoming, *old_stderr; 
         
     char *cd_number_str = NULL;
@@ -113 +116 @@
     log_msg(3, "Starting");
     assert(bkpinfo != NULL);
-    // BERLIOS: doesn't work even if the string is correct !
-    //assert_string_is_neither_NULL_nor_zerolength(basic_call);
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);
-    if (!(midway_call = malloc(1200))) {
-        fatal_error("Cannot malloc midway_call");
-    }
-    if (!(ultimate_call = malloc(1200))) {
-        fatal_error("Cannot malloc ultimate_call");
-    }
-    if (!(tmp = malloc(1200))) {
-        fatal_error("Cannot malloc tmp");
-    }
     malloc_string(incoming);
     malloc_string(old_stderr);
@@ -139 +131 @@
 
     mr_asprintf(&cd_number_str, "%d", cd_no);
-    resolve_naff_tokens(midway_call, tmp1, isofile, "_ISO_");
-    resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    log_msg(4, "basic call = '%s'", tmp1);
+    midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
+    mr_free(tmp1);
+
+    log_msg(4, "midway_call = '%s'", midway_call);
+    tmp = resolve_naff_tokens(midway_call, cd_number_str, "_CD#_");
     mr_free(cd_number_str);
-
-    resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
-    log_msg(4, "basic call = '%s'", tmp1);
-    log_msg(4, "midway_call = '%s'", midway_call);
+    mr_free(midway_call);
+
     log_msg(4, "tmp = '%s'", tmp);
+    ultimate_call = resolve_naff_tokens(tmp, MONDO_LOGFILE, "_ERR_");
+    mr_free(tmp);
+
     log_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_free(ultimate_call);
 
     log_to_screen
@@ -181 +179 @@
         }
         if (retval) {
-            log_msg(2, "Basic call '%s' returned an error.", tmp1);
-            popup_and_OK("Press ENTER to continue.");
             popup_and_OK("mkisofs and/or cdrecord returned an error. CD was not created");
         }
@@ -192 +188 @@
     }
     mr_free(command);
-    mr_free(tmp1);
-    paranoid_free(midway_call);
-    paranoid_free(ultimate_call);
-    paranoid_free(tmp);
     paranoid_free(incoming);
     paranoid_free(old_stderr);

branches/2.2.10/mondo/src/common/libmondo-string-EXT.h

@@ -16 +16 @@
 extern char *number_of_disks_as_string(int noof_disks, char *label);
 extern char *number_to_text(int i);
-extern void resolve_naff_tokens(char *output, char *ip, char *value,
-                                char *token);
+extern char *resolve_naff_tokens(char *ip, char *value, char *token);
 extern char *slice_fname(long bigfileno, long sliceno, char *path,
                          char *s);

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 ******************************************* */

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

@@ -14 +14 @@
 char *number_of_disks_as_string(int noof_disks, char *label);
 char *number_to_text(int i);
-void resolve_naff_tokens(char *output, char *ip, char *value, char *token);
+char *resolve_naff_tokens(char *ip, char *value, char *token);
 char *slice_fname(long bigfileno, long sliceno, char *path, char *s);
 int special_dot_char(int i);