Changeset 3352 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 3, 2015, 1:21:55 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Remove a usage of a full path for parted2fdisk. Using path allows mondoarchive to use either /sbin or /usr/sbin as an install path for it, depending on the distribution used (Philippe Lefevre)
• Fix some statically allocated strings making them dynamic and solve a potential allocation issue as well

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (14 diffs)

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

@@ -868 +868 @@
 int find_dvd_device(char *output, bool try_to_mount)
 {
-    char *tmp;
+    char *tmp = NULL;
     int retval = 0, devno = -1;
 
@@ -877 +877 @@
     }
 
-    malloc_string(tmp);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
     log_msg(5, "tmp = '%s'", tmp);
@@ -901 +900 @@
     return (retval);
 }
-
-
-
 
 
@@ -2872 +2868 @@
 void make_fifo(char *store_name_here, char *stub)
 {
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     assert_string_is_neither_NULL_nor_zerolength(stub);
 
@@ -2881 +2876 @@
     make_hole_for_file(store_name_here);
     mkfifo(store_name_here, S_IRWXU | S_IRWXG);
-    sprintf(tmp, "chmod 770 %s", store_name_here);
+    mr_asprintf(tmp, "chmod 770 %s", store_name_here);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -2901 +2896 @@
 bool set_dev_to_this_if_rx_OK(char *output, char *dev)
 {
-    char *command;
-
-    malloc_string(command);
+    char *command = NULL;
+    bool ret=FALSE;
+
     if (!dev || dev[0] == '\0') {
         output[0] = '\0';
-        return (FALSE);
+        return(ret);
     }
 //  assert_string_is_neither_NULL_nor_zerolength(dev);
@@ -2915 +2910 @@
     if (!does_file_exist(dev)) {
         log_msg(10, "%s doesn't exist. Returning FALSE.", dev);
-        return (FALSE);
-    }
-    sprintf(command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null",
-            512L, dev);
-    if (!run_program_and_log_output(command, FALSE)
-        && !run_program_and_log_output(command, FALSE)) {
+        return(ret);
+    }
+    mr_asprintf(command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null", 512L, dev);
+    if (!run_program_and_log_output(command, FALSE) && !run_program_and_log_output(command, FALSE)) {
         strcpy(output, dev);
         log_msg(4, "Found it - %s", dev);
-        return (TRUE);
+        ret = TRUE;
     } else {
         output[0] = '\0';
         log_msg(4, "It's not %s", dev);
-        return (FALSE);
-    }
+    }
+    mr_free(command);
+    return(ret);
 }
 
@@ -2979 +2973 @@
     return (cd_number);
 }
-
-
-
-
-
 
 
@@ -3218 +3207 @@
 {
     static char output[MAX_STR_LEN];
-    char *command;
-    char *curr_fname;
+    char *command = NULL;
+    char *curr_fname = NULL;
     char *scratch = NULL;
     char *tmp = NULL;
@@ -3225 +3214 @@
 
     struct stat statbuf;
-    command = malloc(1000);
     malloc_string(curr_fname);
     if (!does_file_exist(incoming)) {
@@ -3236 +3224 @@
         while (S_ISLNK(statbuf.st_mode)) {
             log_msg(1, "curr_fname = %s", curr_fname);
-            sprintf(command, "file %s", curr_fname);
+            mr_asprintf(command, "file %s", curr_fname);
             mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+            mr_free(command);
             for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' ';
                  p--);
@@ -3265 +3254 @@
         log_it("resolved %s to %s", incoming, output);
     }
-    paranoid_free(command);
     paranoid_free(curr_fname);
     return (output);
@@ -3279 +3267 @@
     char *output = NULL;
     char *tmp = NULL;
-    char *command;
-    char *fdisk;
+    char *command = NULL;
 #ifdef __IA64__
     struct stat buf;
 #endif
-    malloc_string(command);
-    malloc_string(fdisk);
-    sprintf(fdisk, "/sbin/parted2fdisk");
-    sprintf(command, "%s -l %s 2>/dev/null | grep 'EFI GPT'", fdisk, drive);
+    mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (strstr(tmp, "GPT") == NULL) {
         mr_asprintf(output, "%s", "MBR");
@@ -3297 +3283 @@
 
     log_msg(0, "Found %s partition table format type on %s", output, drive);
-    paranoid_free(command);
-    paranoid_free(fdisk);
     return (output);
 }