Changeset 1592 in MondoRescue for branches/stable/mondo/src/common/libmondo-fork.c

Timestamp:

Aug 9, 2007, 3:19:05 PM (17 years ago)

Author:

Bruno Cornec

Message:

• use of conf file for mkisofs and cdrecord commands
• unification of cdr,cdrw and dvd
• may not compile, modifications will continue

File:

• branches/stable/mondo/src/common/libmondo-fork.c (modified) (4 diffs)

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

@@ -100 +100 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp;
+    char *ultimate_call;
+    char *midway_call;
     char *p = NULL; 
     char *cd_number_str = NULL;
@@ -115 +116 @@
     assert_string_is_neither_NULL_nor_zerolength(logstub);
 
+    ultimate_call = mr_malloc(1200);
     midway_call = mr_malloc(1200);
-    ultimate_call = mr_malloc(1200);
-    tmp = mr_malloc(1200);
 
     mr_asprintf(&cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, basic_call, isofile, "_ISO_");
-    resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    resolve_naff_tokens(ultimate_call, midway_call, cd_number_str, "_CD#_");
     mr_free(cd_number_str);
 
-    resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
     mr_msg(4, "basic call = '%s'", basic_call);
-    mr_msg(4, "midway_call = '%s'", midway_call);
-    mr_msg(4, "tmp = '%s'", tmp);
+    mr_msg(4, "midway call = '%s'", midway_call);
     mr_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
@@ -157 +155 @@
             popup_and_OK(_("Press ENTER to continue."));
             popup_and_OK
-                (_("mkisofs and/or cdrecord returned an error. CD was not created"));
+                (_("CD was not created due to an error."));
         }
     }
@@ -172 +170 @@
     mr_free(midway_call);
     mr_free(ultimate_call);
-    mr_free(tmp);
     return (retval);
 }