Changeset 689 in MondoRescue for trunk/mondo/mondo/common/libmondo-tools.c

Timestamp:

Jul 17, 2006, 7:43:58 PM (18 years ago)

Author:

bcornec

Message:

Still other memory management improvements ( I hope :-)

File:

• trunk/mondo/mondo/common/libmondo-tools.c (modified) (5 diffs)

trunk/mondo/mondo/common/libmondo-tools.c

@@ -348 +348 @@
     char *extra_cdrom_params = NULL;
     char *mondo_mkisofs_sz = NULL;
-    char *command;
-    char *hostname, *ip_address;
+    char *command = NULL;
+    char *hostname = NULL, *ip_address = NULL;
     int retval = 0;
     long avm = 0;
-    char *colon;
-    char *cdr_exe;
-    char *tmp;
-    char *tmp1;
+    char *colon = NULL;
+    char *cdr_exe = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char call_before_iso_user[MAX_STR_LEN] = "\0";
     int rdsiz_MB;
-    char *iso_path;
+    char *iso_path = NULL;
 
     assert(bkpinfo != NULL);
@@ -439 +439 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        if (!(find_home_of_exe("growisofs"))) {
+        tmp = find_home_of_exe("growisofs");
+        if (!tmp) {
             fatal_error("Please install growisofs.");
         }
+        paranoid_free(tmp);
+
         if (bkpinfo->nonbootable_backup) {
             asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
@@ -502 +505 @@
             }
         }
-        if (find_home_of_exe("cdrecord")) {
+        tmp = find_home_of_exe("cdrecord");
+        tmp1 = find_home_of_exe("dvdrecord");
+        if (tmp) {
             asprintf(&cdr_exe, "cdrecord");
-        } else if (find_home_of_exe("dvdrecord")) {
+        } else if (tmp1) {
             asprintf(&cdr_exe, "dvdrecord");
         } else {
             fatal_error("Please install either cdrecord or dvdrecord.");
         }
+        paranoid_free(tmp);
+        paranoid_free(tmp1);
+
         if (bkpinfo->nonbootable_backup) {
             asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", mrconf->mondo_iso_creation_cmd);
@@ -829 +837 @@
 
     /*@ buffers ************ */
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ int's *************** */
@@ -913 +921 @@
         /* IA64 always has one vfat partition for EFI even without Windows */
         // retval += 
-        if (!find_home_of_exe("ms-sys")) {
+        tmp = find_home_of_exe("ms-sys");
+        if (!tmp) {
             log_to_screen(_("Please install ms-sys just in case."));
         }
-#endif
-    }
-
-    if (!find_home_of_exe("cmp")) {
-        if (!find_home_of_exe("true")) {
-            whine_if_not_found("cmp");
-        } else {
-            log_to_screen
-                (_("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you."));
-            if (run_program_and_log_output
-                ("cp -f `which true` /usr/bin/cmp", 0)) {
-                fatal_error("Failed to create dummy 'cmp' file.");
-            }
-        }
-    }
+        paranoid_free(tmp);
+#endif
+    }
+
+    tmp = find_home_of_exe("cmp");
+    if (!tmp) {
+        whine_if_not_found("cmp");
+    }
+    paranoid_free(tmp);
+
     run_program_and_log_output
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);