Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

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

Author:

Bruno Cornec

Message:

r3342@localhost: bruno | 2009-08-14 00:46:51 +0200

• Another round of strcpy suppressions
• find_home_of_exe() now allocates memory which has to be freed by the caller
• Supress useless sz_last_suffix()
• mr_getline now has the same interface as the other mr_mem functions
• valgrind and compiler warnings fixes

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (4 diffs)

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

@@ -418 +418 @@
     char *tmp = NULL;
     char *p = NULL;
-    char call_before_iso_user = NULL;
+    char *call_before_iso_user = NULL;
     char *iso_dev = NULL;
     char *iso_mnt = NULL;
@@ -494 +494 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        if (find_home_of_exe("growisofs")) {
+        tmp = find_home_of_exe("growisofs");
+        if (tmp) {
             strcpy(cdr_exe, "growisofs");
         }                       // unlikely to be used
         else {
+            mr_free(tmp);
             fatal_error("Please install growisofs.");
         }
+        mr_free(tmp);
+
         if (bkpinfo->nonbootable_backup) {
             mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
@@ -554 +558 @@
             mr_asprintf(extra_cdrom_params, "blank=fast ");
         }
-        if (find_home_of_exe("cdrecord")) {
+        tmp = find_home_of_exe("cdrecord");
+        if (tmp) {
             strcpy(cdr_exe, "cdrecord");
-        } else if (find_home_of_exe("dvdrecord")) {
-            strcpy(cdr_exe, "dvdrecord");
         } else {
-            fatal_error("Please install either cdrecord or dvdrecord.");
-        }
+            mr_free(tmp);
+            tmp = find_home_of_exe("dvdrecord");
+            if (tmp) {
+                strcpy(cdr_exe, "dvdrecord");
+            } else {
+                mr_free(tmp);
+                fatal_error("Please install either cdrecord or dvdrecord.");
+            }
+        }
+        mr_free(tmp);
+
         if (bkpinfo->nonbootable_backup) {
             mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
@@ -1000 +1012 @@
     }
 
-    if (!find_home_of_exe("cmp")) {
-        if (!find_home_of_exe("true")) {
-            whine_if_not_found("cmp");
+    tmp = find_home_of_exe("cmp");
+    if (!tmp) {
+        mr_free(tmp);
+        tmp = find_home_of_exe("true");
+        if (!tmp) {
+            retval += 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)) {
+            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)) {
+                mr_free(tmp);
                 fatal_error("Failed to create dummy 'cmp' file.");
             }
         }
     }
-    run_program_and_log_output
-        ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
+    mr_free(tmp);
+
+    run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\""));
     if (strcmp("", tmp)) {