Changeset 2351 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 28, 2009, 2:41:30 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Replacement of some fgets by mr_getline to allow for dyn. memory management.
• Backport of SElinux fix from 2.2.9

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (25 diffs)

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

@@ -313 +313 @@
     /*@ buffers **************************************************** */
     char *program = NULL;
-    char *incoming;
+    char *incoming = NULL;
     char *searchstr = NULL;
     char *tmp = NULL;
@@ -327 +327 @@
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0 && partno < 999);
-
-    malloc_string(incoming);
 
 #ifdef __FreeBSD__
@@ -356 +354 @@
     searchstr = build_partition_name(drive, partno);
     mr_strcat(searchstr, " ");
-    for (res = 0; !res && fgets(incoming, MAX_STR_LEN - 1, fin);) {
+    for (res = 0, mr_getline(incoming, fin); !res && !feof(fin) ; mr_getline(incoming, fin)) {
         if (strstr(incoming, searchstr)) {
             res = 1;
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     mr_free(searchstr);
 
@@ -366 +366 @@
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(incoming);
     return (res);
 }
@@ -567 +566 @@
     /*@ buffers ***************************************************** */
     char *tmp = NULL;
-    char *tmp1 = NULL;
     char *output = NULL;
     char *cdr_exe = NULL;
@@ -634 +632 @@
     }
 
-    malloc_string(tmp);
-    tmp[0] = '\0';
-    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(tmp, MAX_STR_LEN, fin)) {
+    for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
         p = strchr(tmp, '\'');
         if (p) {
@@ -657 +652 @@
             }
         }
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_pclose(fin);
 
@@ -671 +668 @@
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
-            for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-                 (void)fgets(tmp, MAX_STR_LEN, fin)) {
+            for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
                 log_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
@@ -688 +684 @@
                     }
                 }
+                mr_free(tmp);
             }
             paranoid_pclose(fin);
+            mr_free(tmp);
         }
     }
     mr_free(phrase_two);
-    paranoid_free(tmp);
 
 #endif
@@ -725 +722 @@
 
     if (found_it) {
-        mr_asprintf(tmp1, "grep \"%s=ide-scsi\" " CMDLINE " &> /dev/null", strrchr(output, '/') + 1);
-        if (system(tmp1) == 0) {
+        mr_asprintf(tmp, "grep \"%s=ide-scsi\" " CMDLINE " &> /dev/null", strrchr(output, '/') + 1);
+        if (system(tmp) == 0) {
             log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);
             found_it = FALSE;
             mr_free(output);
         }
-        mr_free(tmp1);
+        mr_free(tmp);
     }
 
@@ -772 +769 @@
             mr_free(output);
         } else {
-            mr_asprintf(tmp1, "%s/archives", mountpoint);
+            mr_asprintf(tmp, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
                 log_msg(4, "[Cardigans] I'll take it back");
@@ -784 +781 @@
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
-            mr_free(tmp1);
+            mr_free(tmp);
         }
     }
@@ -808 +805 @@
 
     log_msg(1, "command=%s", command);
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_free(output);
-    if (strlen(tmp1) > 0) {
-        mr_asprintf(output, "%s", tmp1);
+    if (strlen(tmp) > 0) {
+        mr_asprintf(output, "%s", tmp);
         log_msg(4, "Finally found it at %s", output);
     } else {
         log_msg(4, "Still couldn't find it.");
     }
-    mr_free(tmp1);
+    mr_free(tmp);
 
     return (output);
@@ -1026 +1023 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming;
+    char *incoming = NULL;
     char *device_with_tab = NULL;
     char *device_with_space = NULL;
@@ -1044 +1041 @@
     }
 
-    malloc_string(incoming);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1067 +1063 @@
         return(FALSE);
     }
-    for ((void)fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         (void)fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        if (strstr(incoming, device_with_space) //> incoming
-            || strstr(incoming, device_with_tab))   // > incoming)
-        {
+
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+        if (strstr(incoming, device_with_space) || strstr(incoming, device_with_tab)) {
             paranoid_pclose(fin);
-            paranoid_free(incoming);
+            mr_free(incoming);
             return(TRUE);
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     mr_free(device_with_tab);
     mr_free(device_with_space);
@@ -1086 +1082 @@
     }
     mr_free(tmp);
-    paranoid_free(incoming);
     return(retval);
 }
@@ -2308 +2303 @@
     char *list_drives_cmd = NULL;
     char *tmp = NULL;
-    char *current_drive;
+    char *current_drive = NULL;
 
     /*@ pointers *************************************************** */
-    FILE *pdrives;
+    FILE *pdrives = NULL;
 
     /*@ int ******************************************************** */
@@ -2338 +2333 @@
     }
 
-    malloc_string(current_drive);
-    for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-         (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
-        strip_spaces(current_drive);
+    for (mr_getline(current_drive, pdrives); !feof(pdrives); mr_getline(current_drive, pdrives)) {
+        mr_strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
@@ -2349 +2342 @@
             mr_asprintf(which_device, "%s", current_drive);
             */
+            mr_free(current_drive);
             break;
         }
@@ -2357 +2351 @@
             mr_asprintf(which_device, "%s", current_drive);
             */
+            mr_free(current_drive);
             break;
         }
-    }
+        mr_free(current_drive);
+    }
+    mr_free(current_drive);
+
     if (pclose(pdrives)) {
         log_OS_error("Cannot pclose pdrives");
@@ -2365 +2363 @@
     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 {
@@ -2382 +2377 @@
             log_OS_error("Unable to open list of drives");
             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)) {
-            strip_spaces(current_drive);
+        for (mr_getline(current_drive, pdrives); !feof(pdrives); mr_getline(current_drive, pdrives)) {
+            mr_strip_spaces(current_drive);
             log_it("looking at partition %s's BR", current_drive);
             if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
@@ -2397 +2390 @@
                 mr_asprintf(which_device, "%s", current_drive);
                 */
+                mr_free(current_drive);
                 break;
             }
@@ -2405 +2399 @@
                 mr_asprintf(which_device, "%s", current_drive);
                 */
+                mr_free(current_drive);
                 break;
             }
-        }
+            mr_free(current_drive);
+        }
+        mr_free(current_drive);
+
         if (pclose(pdrives)) {
             log_OS_error("Cannot pclose pdrives");
         }
         log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-        paranoid_free(current_drive);
         if (count_grubs && !count_lilos) {
             return ('G');