Changeset 1127 in MondoRescue

Timestamp:

Feb 10, 2007, 1:33:28 AM (18 years ago)

Author:

Bruno Cornec

Message:

End on memory mngt for libmondo-devices.c for the moment

Location:

branches/stable/mondo/src/common

Files:

• libmondo-devices-EXT.h (modified) (1 diff)
• libmondo-devices.c (modified) (11 diffs)

branches/stable/mondo/src/common/libmondo-devices-EXT.h

@@ -71 +71 @@
 
 extern char *which_partition_format(const char *drive);
+extern char *bkptype_to_string(t_bkptype bt);

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

@@ -2267 +2267 @@
 
 
-
-
-
-
-
 /**
  * Find out what device is mounted as root (/).
@@ -2361 +2356 @@
     /*@ buffer ***************************************************** */
     char *list_drives_cmd;
-    char *current_drive;
+    char *current_drive = NULL;
 
     /*@ pointers *************************************************** */
@@ -2369 +2364 @@
     int count_lilos = 0;
     int count_grubs = 0;
+    size_t n = 0;
 
     /*@ end vars *************************************************** */
-
-    malloc_string(list_drives_cmd);
-    malloc_string(current_drive);
 
 #ifdef __IA64__
@@ -2380 +2373 @@
 #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());
@@ -2391 +2381 @@
         log_OS_error("Unable to open list of drives");
         mr_free(list_drives_cmd);
-        mr_free(current_drive);
         return ('\0');
     }
-    for (fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-         fgets(current_drive, MAX_STR_LEN, pdrives)) {
+    mr_free(list_drives_cmd);
+
+    for (mr_getline(&current_drive, &n, pdrives); !feof(pdrives);
+         mr_getline(&current_drive, &n, pdrives)) {
         strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
@@ -2409 +2400 @@
         }
     }
+
     if (pclose(pdrives)) {
         log_OS_error("Cannot pclose pdrives");
     }
     log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-    mr_free(list_drives_cmd);
-    mr_free(current_drive);
     if (count_grubs && !count_lilos) {
         return ('G');
@@ -2430 +2420 @@
 
 
-
-
 /**
  * Write zeroes over the first 16K of @p device.
@@ -2456 +2444 @@
     return (0);
 }
+
 
 /**
@@ -2467 +2456 @@
 {
     static char output[MAX_STR_LEN];
-    char *command;
-    char *curr_fname;
-    char *scratch;
-    char *tmp;
-    char *p;
+    char *command = NULL;
+    char *curr_fname = NULL;
+    char *scratch = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
 
     struct stat statbuf;
-    command = malloc(1000);
     malloc_string(tmp);
     malloc_string(scratch);
@@ -2487 +2475 @@
         while (S_ISLNK(statbuf.st_mode)) {
             mr_msg(1, "curr_fname = %s", curr_fname);
-            sprintf(command, "file %s", curr_fname);
+            mr_asprintf(&command, "file %s", curr_fname);
             strcpy(tmp, call_program_and_get_last_line_of_output(command));
+            mr_free(command);
+
             for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' ';
                  p--);
@@ -2514 +2504 @@
         log_it("resolved %s to %s", incoming, output);
     }
-    mr_free(command);
     mr_free(curr_fname);
     mr_free(tmp);