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

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

@@ -509 +509 @@
     /*@ buffers ************************ */
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *cdr_exe = NULL;
     char *command = NULL;
@@ -523 +524 @@
     }
     run_program_and_log_output("insmod ide-scsi", -1);
-    if (find_home_of_exe("cdrecord")) {
+    tmp = find_home_of_exe("cdrecord");
+    if (tmp) {
         mr_asprintf(cdr_exe, "cdrecord");
     } else {
         mr_asprintf(cdr_exe, "dvdrecord");
     }
-    if (find_home_of_exe(cdr_exe)) {
+    mr_free(tmp);
+
+    tmp1 = find_home_of_exe(cdr_exe);
+    if (tmp1) {
         mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1", cdr_exe);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
+    mr_free(tmp1);
+
     if ((tmp == NULL) || (strlen(tmp) < 2)) {
         mr_free(tmp);
@@ -603 +610 @@
     make_hole_for_dir(mountpoint);
 
-    if (find_home_of_exe("cdrecord")) {
+    tmp = find_home_of_exe("cdrecord");
+    if (tmp) {
         mr_asprintf(cdr_exe, "cdrecord");
     } else {
         mr_asprintf(cdr_exe, "dvdrecord");
     }
-
-    if (!find_home_of_exe(cdr_exe)) {
+    mr_free(tmp);
+
+    tmp = find_home_of_exe(cdr_exe);
+    if (!tmp) {
         mr_asprintf(output, "/dev/cdrom");
         log_msg(4, "Can't find cdrecord; assuming %s", output);
@@ -616 +626 @@
             log_msg(4, "That didn't work. Sorry.");
             mr_free(output);
-            return(output);
-        } else {
-            return(output);
-        }
-    }
+        }
+        mr_free(tmp);
+        return(output);
+    }
+    mr_free(tmp);
 
     mr_asprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
@@ -992 +1002 @@
         retval = 0;
     } else {
-        mr_getline(&good_formats, pin);
+        mr_getline(good_formats, pin);
         if (pclose(pin)) {
             log_OS_error("Cannot pclose good formats");
@@ -2344 +2354 @@
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
             count_grubs++;
+            /* BERLIOS : removed as I don't think it's mandatory here
             mr_free(which_device);
             mr_asprintf(which_device, "%s", current_drive);
+            */
             break;
         }
         if (does_string_exist_in_boot_block(current_drive, "LILO")) {
             count_lilos++;
+            /* BERLIOS : removed as I don't think it's mandatory here
             mr_free(which_device);
             mr_asprintf(which_device, "%s", current_drive);
+            */
             break;
         }
@@ -2388 +2402 @@
             if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
                 count_grubs++;
+                /* BERLIOS : removed as I don't think it's mandatory here
                 mr_free(which_device);
                 mr_asprintf(which_device, "%s", current_drive);
+                */
                 break;
             }
             if (does_string_exist_in_boot_block(current_drive, "LILO")) {
                 count_lilos++;
+                /* BERLIOS : removed as I don't think it's mandatory here
                 mr_free(which_device);
                 mr_asprintf(which_device, "%s", current_drive);
+                */
                 break;
             }