Changeset 2405 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Sep 17, 2009, 3:45:24 AM (15 years ago)

Author:

Bruno Cornec

Message:

Removes some malloc_string static allocation

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (4 diffs)
• mondo-rstr-compare.c (modified) (7 diffs)
• mondo-rstr-tools.c (modified) (8 diffs)
• mondorestore.c (modified) (7 diffs)

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

@@ -61 +61 @@
 {
     char *command = NULL;
-    char *tmp;
     int lino;
     int i;
@@ -72 +71 @@
 // If LVMs are present and a zero-and-reboot wasn't recently undertaken
 // then zero & insist on reboot.
-    malloc_string(tmp);
     buf = malloc(blocksize);
     if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
@@ -91 +89 @@
         if (lino == drivelist->entries) {
 // zero & reboot
-            log_to_screen
-                ("I am sorry for the inconvenience but I must ask you to reboot.");
-            log_to_screen
-                ("I need to reset the Master Boot Record; in order to be");
-            log_to_screen
-                ("sure the kernel notices, I must reboot after doing it.");
+            log_to_screen("I am sorry for the inconvenience but I must ask you to reboot.");
+            log_to_screen("I need to reset the Master Boot Record; in order to be");
+            log_to_screen("sure the kernel notices, I must reboot after doing it.");
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
@@ -127 +122 @@
     }
 // Still here? Cool!
-    paranoid_free(tmp);
     log_msg(1, "Cool. I didn't have to wipe anything.");
 }

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -43 +43 @@
 
   /** needs malloc *******/
-    char *checksum_ptr = NULL;
-    char *original_cksum_ptr = NULL;
-    char *bigfile_fname_ptr = NULL;
-    char *tmp_ptr = NULL;
-    char *command_ptr = NULL;
-
-    char *checksum, *bigfile_fname, *tmp, *command;
+    char *checksum = NULL;
+    char *original_cksum = NULL;
+    char *bigfile_fname = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     char *p;
@@ -56 +54 @@
 
     struct s_filename_and_lstat_info biggiestruct;
-
-    malloc_string(checksum);
-    malloc_string(bigfile_fname);
-    malloc_string(tmp);
-    malloc_string(command);
 
   /*********************************************************************
@@ -83 +76 @@
     paranoid_fclose(fin);
 
-    mr_asprintf(checksum_ptr, "%s", biggiestruct.checksum);
-    mr_asprintf(bigfile_fname_ptr, "%s", biggiestruct.filename);
+    mr_asprintf(checksum, "%s", biggiestruct.checksum);
+    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
 
     log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
@@ -90 +83 @@
 
     if (!g_text_mode) {
-        mr_asprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
-        newtDrawRootText(0, 22, tmp_ptr);
-        paranoid_free(tmp_ptr);
+        mr_asprintf(tmp, "Comparing %s", bigfile_fname);
+        newtDrawRootText(0, 22, tmp);
+        paranoid_free(tmp);
         newtRefresh();
     }
     if (!checksum[0]) {
-        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
-    }
-    if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
-        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname_ptr);
-        mr_free(bigfile_fname_ptr);
+        log_msg(2, "Warning - %s has no checksum", bigfile_fname);
+    }
+    if (!strncmp(bigfile_fname, "/dev/", 5)) {
+        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname);
+        mr_free(bigfile_fname);
         return (1);
     }
 
-    mr_asprintf(command_ptr, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname_ptr);
-    log_msg(2, command_ptr);
-    i =  system(command_ptr);
-    mr_free(command_ptr);
-
-    mr_asprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
-    paranoid_system(tmp_ptr);
-    paranoid_free(tmp_ptr);
+    mr_asprintf(command, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname);
+    log_msg(2, command);
+    i =  system(command);
+    mr_free(command);
+
+    mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    paranoid_system(tmp);
+    paranoid_free(tmp);
 
     if (i) {
@@ -120 +113 @@
             log_msg(2,
                     "Unable to open /tmp/md5sum.txt; can't get live checksum");
-            mr_free(bigfile_fname_ptr);
+            mr_free(bigfile_fname);
             return (1);
         } else {
-            mr_getline(original_cksum_ptr, fin);
+            mr_getline(original_cksum, fin);
             paranoid_fclose(fin);
-            p = strchr(original_cksum_ptr, ' ');
+            p = strchr(original_cksum, ' ');
             if (p) {
                 *p = '\0';
@@ -131 +124 @@
         }
     }
-    mr_asprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
-    if ((original_cksum_ptr != NULL) && (strcmp(checksum_ptr, original_cksum_ptr) == 0)) {
-        mr_strcat(tmp_ptr, " ... OK");
-    } else {
-        mr_strcat(tmp_ptr, "... changed");
+    mr_asprintf(tmp, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname);
+    if ((original_cksum != NULL) && (strcmp(checksum, original_cksum) == 0)) {
+        mr_strcat(tmp, " ... OK");
+    } else {
+        mr_strcat(tmp, "... changed");
         retval++;
     }
-    mr_free(checksum_ptr);
-    mr_free(original_cksum_ptr);
-
-    log_msg(1, tmp_ptr);
-    paranoid_free(tmp_ptr);
+    mr_free(checksum);
+    mr_free(original_cksum);
+
+    log_msg(1, tmp);
+    paranoid_free(tmp);
 
     if (retval) {
@@ -148 +141 @@
             fatal_error("Cannot openout changed.txt");
         }
-        fprintf(fout, "%s\n", bigfile_fname_ptr);
+        fprintf(fout, "%s\n", bigfile_fname);
         paranoid_fclose(fout);
     }
-    mr_free(bigfile_fname_ptr);
-
-    paranoid_free(bigfile_fname);
-    paranoid_free(checksum);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(bigfile_fname);
 
     return (retval);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -698 +698 @@
 t_bkptype media_specified_by_user;
 
-malloc_string(tmp);
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
 assert(bkpinfo != NULL);
@@ -1099 +1098 @@
 g_backup_media_type = bkpinfo->backup_media_type;
 paranoid_free(value);
-paranoid_free(tmp);
 return (0);
 
@@ -1499 +1497 @@
     char *command = NULL;
     char *boot_device = NULL;
-    char *rootdev;
-    char *rootdrive;
-    char *conffile;
     char *tmp = NULL;
     char *editor = NULL;
@@ -1509 +1504 @@
     bool done;
 
-    malloc_string(rootdev);
-    malloc_string(rootdrive);
-    malloc_string(conffile);
     assert_string_is_neither_NULL_nor_zerolength(bd);
     mr_asprintf(boot_device, "%s", bd);
@@ -1617 +1609 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(rootdev);
-    paranoid_free(rootdrive);
-    paranoid_free(conffile);
 
     return (res);
@@ -2190 +2179 @@
 
    /** malloc *****/
-    char *device;
     char *command = NULL;
     char *cfg_file = NULL;
-    char *mounted_cfgf_path;
     char *tmp = NULL;
     char *tmp1 = NULL;
     char *mountpt = NULL;
-    char *ramdisk_fname;
     char *mountlist_file = NULL;
     bool extract_mountlist_stub = FALSE;
@@ -2205 +2191 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(mounted_cfgf_path);
-    malloc_string(ramdisk_fname);
-    malloc_string(device);
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
     mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    device[0] = '\0';
     chdir(bkpinfo->tmpdir);
     mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
@@ -2394 +2376 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(device);
-    paranoid_free(mounted_cfgf_path);
-    paranoid_free(ramdisk_fname);
     return (retval);
 }

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

@@ -1028 +1028 @@
     char *tmp = NULL;
     char *bzip2_command = NULL;
-    char *ntfsprog_command;
     char *suffix = NULL;
     char *sz_devfile = NULL;
@@ -1050 +1049 @@
     ubuf = &the_utime_buf;
     assert(bkpinfo != NULL);
-
-    malloc_string(ntfsprog_command);
 
     pathname_of_last_file_restored[0] = '\0';
@@ -1268 +1265 @@
     mr_free(outfile_fname);
     paranoid_free(bigblk);
-    paranoid_free(ntfsprog_command);
 
     return (retval);
@@ -1307 +1303 @@
     char *command = NULL;
     char *outfile_fname = NULL;
-    char *ntfsprog_command;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -1328 +1323 @@
 
     malloc_string(tmp);
-    malloc_string(ntfsprog_command);
     old_loglevel = g_loglevel;
     assert(bkpinfo != NULL);
@@ -1516 +1510 @@
 
     paranoid_free(tmp);
-    paranoid_free(ntfsprog_command);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1929 +1922 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-restore_all_biggiefiles_from_CD(struct s_node *filelist)
-{
+int restore_all_biggiefiles_from_CD(struct s_node *filelist) {
+
     int retval = 0;
     int res = 0;