Changeset 2315 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-fork.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-fork.c (modified) (5 diffs)

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);