Changeset 2330 in MondoRescue

Timestamp:

Aug 18, 2009, 3:20:49 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3341@localhost: bruno | 2009-08-13 22:36:24 +0200

• Replacement of some strcpy
• Change allocation done in resolve_softlinks_to_get_to_actual_device_file(), where_is_root_mounted(), bkptype_to_string(), which_boot_loader()

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (8 diffs)
• common/libmondo-cli.c (modified) (3 diffs)
• common/libmondo-devices-EXT.h (modified) (1 diff)
• common/libmondo-devices.c (modified) (24 diffs)
• common/libmondo-mountlist.c (modified) (2 diffs)
• mondorestore/mondo-prep.c (modified) (3 diffs)

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

@@ -2559 +2559 @@
  * @return 0 (there was an OK CD in the drive) or 1 (there wasn't).
  */
-int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev,
-                                             bool keep_looping)
-{
+int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev, bool keep_looping) {
     int res = 0;
     char *bkp = NULL;
@@ -2823 +2821 @@
     /*@ buffers ************************************************** */
     char *tmp = NULL;
-    char *checksum_line, *command;
+    char *checksum_line = NULL;
+    char *command;
     char *tempblock;
     char *curr_slice_fname_uncompressed = NULL;
@@ -2859 +2858 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
-    malloc_string(checksum_line);
 
     biggiestruct.for_backward_compatibility = '\n';
@@ -2877 +2875 @@
     if (ntfsprog_fifo) {
         file_to_openin = ntfsprog_fifo;
-        strcpy(checksum_line, "IGNORE");
-        log_msg(2,
-                "Not calculating checksum for %s: it would take too long",
-                biggie_filename);
+        mr_asprintf(checksum_line, "IGNORE");
+        log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
         if ( !find_home_of_exe("ntfsresize")) {
             fatal_error("ntfsresize not found");
@@ -2904 +2900 @@
         }
         mr_free(command);
-        (void) fgets(checksum_line, MAX_STR_LEN, fin);
+        mr_getline(checksum_line, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -2918 +2914 @@
     }
     strcpy(biggiestruct.checksum, checksum_line);
+    mr_free(checksum_line);
 
     mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
@@ -2940 +2937 @@
         log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
 
-        paranoid_free(checksum_line);
         mr_free(suffix);
         return (1);
@@ -3074 +3070 @@
     mr_free(tmp);
 
-    paranoid_free(checksum_line);
     return (retval);
 }

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

@@ -908 +908 @@
         }
         if (!flag_set['d']) {
-            if ((tmp = find_dvd_device(flag_val['d'])) != NULL) {
-                strcpy(flag_val['d'],tmp);
-                mr_free(tmp);
+            if ((tmp1 = find_dvd_device(flag_val['d'])) != NULL) {
+                strcpy(flag_val['d'],tmp1);
+                mr_free(tmp1);
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);
@@ -1323 +1323 @@
     if (flag_set['f']) {
         mr_free(bkpinfo->boot_device);
-        mr_asprintf(bkpinfo->boot_device, "%s", resolve_softlinks_to_get_to_actual_device_file(flag_val['f']));
+        bkpinfo->boot_device = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
     }
 
@@ -1332 +1332 @@
 
     if (flag_set['Q']) {
-        i = which_boot_loader(tmp);
-        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
-        printf("boot loader is %c, residing at %s\n", i, tmp);
+        i = which_boot_loader(tmp1);
+        log_msg(3, "boot loader is %c, residing at %s", i, tmp1);
+        printf("boot loader is %c, residing at %s\n", i, tmp1);
+        mr_free(tmp1);
         finish(0);
     }

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

@@ -61 +61 @@
 extern int inject_device(char *dev);
 extern bool does_nonMS_partition_exist(void);
-extern char *resolve_softlinks_to_get_to_actual_device_file(char
-                                                            *incoming);
+extern char *resolve_softlinks_to_get_to_actual_device_file(char *incoming);
 
 extern void set_g_cdrom_and_g_dvd_to_bkpinfo_value();

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

@@ -112 +112 @@
     bool is_this_a_ramdisk = FALSE;
 
-    mr_asprintf(tmp, "%s", where_is_root_mounted());
+    tmp = where_is_root_mounted();
     log_msg(0, "root is currently mounted at %s\n", tmp);
 
@@ -156 +156 @@
 static char *bkptype_to_string(t_bkptype bt)
 {
-    static char output[MAX_STR_LEN / 4];
+    char *output;
     switch (bt) {
     case none:
-        strcpy(output, "none");
+        mr_asprintf(output, "none");
         break;
     case iso:
-        strcpy(output, "iso");
+        mr_asprintf(output, "iso");
         break;
     case cdr:
-        strcpy(output, "cdr");
+        mr_asprintf(output, "cdr");
         break;
     case cdrw:
-        strcpy(output, "cdrw");
+        mr_asprintf(output, "cdrw");
         break;
     case cdstream:
-        strcpy(output, "cdstream");
+        mr_asprintf(output, "cdstream");
         break;
     case nfs:
-        strcpy(output, "nfs");
+        mr_asprintf(output, "nfs");
         break;
     case tape:
-        strcpy(output, "tape");
+        mr_asprintf(output, "tape");
         break;
     case udev:
-        strcpy(output, "udev");
+        mr_asprintf(output, "udev");
         break;
     case usb:
-        strcpy(output, "usb");
+        mr_asprintf(output, "usb");
         break;
     default:
-        strcpy(output, "default");
+        mr_asprintf(output, "default");
     }
     return (output);
@@ -572 +572 @@
     char *output = NULL;
     char *cdr_exe = NULL;
-    char *phrase_one = NULL;
     char *phrase_two = NULL;
     char *command = NULL;
@@ -634 +633 @@
     }
 
-    malloc_string(phrase_one);
-    phrase_one[0] = '\0';
-    malloc_string(phrase_two);
-    phrase_two[0] = '\0';
-
     malloc_string(tmp);
     tmp[0] = '\0';
@@ -649 +643 @@
                 for (r = q; *(r - 1) == ' '; r--);
                 *r = '\0';
-                strcpy(phrase_one, p);
                 p = strchr(++q, '\'');
                 if (p) {
@@ -658 +651 @@
                         }
                         *q = '\0';
-                        strcpy(phrase_two, p);
+                        mr_asprintf(phrase_two, "%s", p);
                     }
                 }
@@ -665 +658 @@
     }
     paranoid_pclose(fin);
-    paranoid_free(phrase_one);
 
 #ifndef __FreeBSD__
-    if (strlen(phrase_two) == 0) {
+    if (!phrase_two || strlen(phrase_two) == 0) {
         log_msg(4, "Not running phase two. String is empty.");
     } else {
@@ -699 +691 @@
         }
     }
-    paranoid_free(phrase_two);
+    mr_free(phrase_two);
     paranoid_free(tmp);
 
@@ -1438 +1430 @@
     }
     */
-    log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
+    tmp = bkptype_to_string(bkpinfo->backup_media_type);
+    log_msg(3, "media type = %s", tmp);
+    mr_free(tmp);
+
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-    bkpinfo->compression_level =
-        (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
-    bkpinfo->use_lzo =
-        (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+    bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+    bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
     mvaddstr_and_log_it(2, 0, " ");
 
@@ -1973 +1966 @@
     log_it("media device = %s", bkpinfo->media_device);
     log_it("media size = %ld", bkpinfo->media_size[1]);
-    log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
+    tmp = bkptype_to_string(bkpinfo->backup_media_type);
+    log_it("media type = %s", tmp);
+    mr_free(tmp);
+
     if (bkpinfo->prefix) {
         log_it("prefix = %s", bkpinfo->prefix);
@@ -2235 +2231 @@
  * The mountpoint (where it's mounted) will obviously be '/'.
  */
-char *where_is_root_mounted()
-{
+char *where_is_root_mounted() {
     /*@ buffers **************** */
-    static char tmp[MAX_STR_LEN];
+    char *output;
 
 
 #ifdef __FreeBSD__
-    strcpy(tmp, call_program_and_get_last_line_of_output
-           ("mount | grep \" on / \" | cut -d' ' -f1"));
+    mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
 #else
-    strcpy(tmp, call_program_and_get_last_line_of_output
-           ("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
-    if (strstr(tmp, "/dev/cciss/")) {
-        strcpy(tmp, call_program_and_get_last_line_of_output
-               ("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
-    }
-    if (strstr(tmp, "/dev/md")) {
-        strcpy(tmp,
-               call_program_and_get_last_line_of_output
-               ("mount | grep \" on / \" | cut -d' ' -f1"));
-    }
-#endif
-
-    return (tmp);
+    mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
+    if (strstr(output, "/dev/cciss/")) {
+        mr_free(output);
+        mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
+    }
+    if (strstr(output, "/dev/md")) {
+        mr_free(output);
+        mr_asprintf(output, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
+    }
+#endif
+
+    return (output);
 }
 
@@ -2269 +2261 @@
  */
 #ifdef __FreeBSD__
-char which_boot_loader(char *which_device)
-{
+char which_boot_loader(char *which_device) {
     int count_lilos = 0;
     int count_grubs = 0;
@@ -2286 +2277 @@
         count_boot0s++;
     }
-    if (does_string_exist_in_first_N_blocks
-        (which_device, "FreeBSD/i386", 17)) {
+    if (does_string_exist_in_first_N_blocks(which_device, "FreeBSD/i386", 17)) {
         count_dangerouslydedicated++;
     }
@@ -2313 +2303 @@
 #else
 
-char which_boot_loader(char *which_device)
-{
+char which_boot_loader(char *which_device) {
     /*@ buffer ***************************************************** */
     char *list_drives_cmd = NULL;
+    char *tmp = NULL;
     char *current_drive;
 
@@ -2328 +2318 @@
     /*@ end vars *************************************************** */
 
-    malloc_string(current_drive);
 
 #ifdef __IA64__
@@ -2334 +2323 @@
     return ('E');
 #endif
-    assert(which_device != NULL);
-
-    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());
+
+    tmp = where_is_root_mounted();
+    mr_asprintf(list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", tmp);
+    mr_free(tmp);
     log_it("list_drives_cmd = %s", list_drives_cmd);
 
-    if (!(pdrives = popen(list_drives_cmd, "r"))) {
+    pdrives = popen(list_drives_cmd, "r");
+    mr_free(list_drives_cmd);
+
+    if (!pdrives) {
         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);
-
+
+    malloc_string(current_drive);
     for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
          (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
@@ -2353 +2344 @@
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
             count_grubs++;
-            strcpy(which_device, current_drive);
+            mr_free(which_device);
+            mr_asprintf(which_device, "%s", current_drive);
             break;
         }
         if (does_string_exist_in_boot_block(current_drive, "LILO")) {
             count_lilos++;
-            strcpy(which_device, current_drive);
+            mr_free(which_device);
+            mr_asprintf(which_device, "%s", current_drive);
             break;
         }
@@ -2395 +2388 @@
             if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
                 count_grubs++;
-                strcpy(which_device, current_drive);
+                mr_free(which_device);
+                mr_asprintf(which_device, "%s", current_drive);
                 break;
             }
             if (does_string_exist_in_boot_block(current_drive, "LILO")) {
                 count_lilos++;
-                strcpy(which_device, current_drive);
+                mr_free(which_device);
+                mr_asprintf(which_device, "%s", current_drive);
                 break;
             }
@@ -2461 +2456 @@
 char *resolve_softlinks_to_get_to_actual_device_file(char *incoming)
 {
-    static char output[MAX_STR_LEN];
+    char *output;
     char *command = NULL;
     char *curr_fname;
@@ -2471 +2466 @@
     malloc_string(curr_fname);
     if (!does_file_exist(incoming)) {
-        log_it
-            ("resolve_softlinks_to_get_to_actual_device_file --- device not found");
-        strcpy(output, incoming);
+        log_it("resolve_softlinks_to_get_to_actual_device_file --- device not found");
+        mr_asprintf(output, "%s", incoming);
     } else {
         strcpy(curr_fname, incoming);
@@ -2482 +2476 @@
             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--);
+            for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' '; p--);
             p++;
             mr_asprintf(scratch, "%s", p);
@@ -2506 +2499 @@
             lstat(curr_fname, &statbuf);
         }
-        strcpy(output, curr_fname);
+        mr_asprintf(output, "%s", curr_fname);
         log_it("resolved %s to %s", incoming, output);
     }
@@ -2521 +2514 @@
 char *which_partition_format(const char *drive)
 {
-    static char output[4];
+    char *output;
     char *tmp = NULL;
     char *command = NULL;
@@ -2538 +2531 @@
 
     if (strstr(tmp, "GPT") == NULL) {
-        strcpy(output, "MBR");
+        mr_asprintf(output, "MBR");
     } else {
-        strcpy(output, "GPT");
+        mr_asprintf(output, "GPT");
     }
     mr_free(tmp);

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

@@ -430 +430 @@
         part_table_fmt = which_partition_format(drive);
         /* no spare primary partitions to help accommodate the logical(s)? */
-        if ((curr_part_no >= 5 && prev_part_no == 4)
-            && (strcmp(part_table_fmt, "MBR") == 0)) {
+        if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
             mr_asprintf(tmp, " Partition 4 of %s is occupied.", drive);
             log_it(tmp);
@@ -438 +437 @@
             res++;
         }
+        mr_free(part_table_fmt);
+
         /* does partition /dev/hdNX exist more than once in the mountlist? */
         for (i = 0, mountpoint_copies = 0, device_copies = 0;

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -1652 +1652 @@
     /** pointers **********************************************************/
     char *p;
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
     FILE *fout;
 
@@ -1699 +1699 @@
                     log_to_screen("You need to leave at least one partition free, for 'extended/logical'");
                     mr_free(partition_name);
-                    paranoid_free(output);
+                    mr_free(output);
+                    mr_free(part_table_fmt);
                     return (1);
                 } else {
@@ -1711 +1712 @@
         }
     }
+    mr_free(part_table_fmt);
+
     mr_strcat(output, "\n");    /*start block (ENTER for next free blk */
     if (partsize > 0) {