Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 29, 2009, 7:19:14 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3144@localhost: bruno | 2009-06-26 12:18:08 +0200

• Remove mr_string.c|.h useless and in de=uplication with mr_str.c|.h
• Solve with valgrind's help some memroy leak (harmless mostly)
• Solve a seg fault at end, when unallocating a bkpinfo member after the strcuture disallocation !
• after mr_strtok, memory ssociated with the token needs to be free
• Adds a new function free_newt_stuff to free newt related allocated memory
• Do not exit if mr_free is unsuccessful, and only warn when debug > 8

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (7 diffs)

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

@@ -2406 +2406 @@
 {
     /*@ buffer ***************************************************** */
-    char *list_drives_cmd;
+    char *list_drives_cmd = NULL;
     char *current_drive;
 
@@ -2418 +2418 @@
     /*@ end vars *************************************************** */
 
-    malloc_string(list_drives_cmd);
     malloc_string(current_drive);
 
@@ -2426 +2425 @@
 #endif
     assert(which_device != NULL);
-    //  sprintf (list_drives_cmd,
-    //       "fdisk -l | grep /dev | grep cyl | tr ':' ' ' | cut -d' ' -f2");
-
-    sprintf(list_drives_cmd,
+
+    mr_asprintf(&list_drives_cmd,
             "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
             where_is_root_mounted());
@@ -2436 +2433 @@
     if (!(pdrives = popen(list_drives_cmd, "r"))) {
         log_OS_error("Unable to open list of drives");
-        paranoid_free(list_drives_cmd);
+        mr_free(list_drives_cmd);
         paranoid_free(current_drive);
         return ('\0');
     }
+    mr_free(list_drives_cmd);
+
     for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
          (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
@@ -2460 +2459 @@
     log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
     if (count_grubs && !count_lilos) {
+        paranoid_free(current_drive);
         return ('G');
     } else if (count_lilos && !count_grubs) {
+        paranoid_free(current_drive);
         return ('L');
     } else if (count_grubs == 1 && count_lilos == 1) {
         log_it("I'll bet you used to use LILO but switched to GRUB...");
+        paranoid_free(current_drive);
         return ('G');
     } else {
         // We need to look on each partition then
-        sprintf(list_drives_cmd,
+        mr_asprintf(&list_drives_cmd,
             "parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
         log_it("list_drives_cmd = %s", list_drives_cmd);
@@ -2474 +2476 @@
         if (!(pdrives = popen(list_drives_cmd, "r"))) {
             log_OS_error("Unable to open list of drives");
-            paranoid_free(list_drives_cmd);
+            mr_free(list_drives_cmd);
             paranoid_free(current_drive);
             return ('\0');
         }
+        mr_free(list_drives_cmd);
+
         for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
             (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
@@ -2497 +2501 @@
         }
         log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-        paranoid_free(list_drives_cmd);
         paranoid_free(current_drive);
         if (count_grubs && !count_lilos) {