Changeset 1080 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-restore.c

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

File:

• branches/stable/mondo/src/mondorestore/mondo-restore.c (modified) (19 diffs)

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -1 +1 @@
 /***************************************************************************
-$Id$
-restores mondoarchive data
+* restores mondoarchive data
+* $Id$
 ***************************************************************************/
 
@@ -20 +20 @@
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#include "mr_mem.h"
 
 extern void twenty_seconds_til_yikes(void);
@@ -313 +314 @@
         retval += compare_mode(bkpinfo, mountlist, raidlist);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -631 +632 @@
     }
   end_of_func:
-    paranoid_free(tmp);
-    paranoid_free(fstab_fname);
-    paranoid_free(old_restpath);
+    mr_free(tmp);
+    mr_free(fstab_fname);
+    mr_free(old_restpath);
     iamhere("Leaving interactive_mode()");
     return (retval);
@@ -912 +913 @@
     assert(bkpinfo != NULL);
     malloc_string(old_restpath);
-    mountlist = malloc(sizeof(struct mountlist_itself));
-    raidlist = malloc(sizeof(struct raidlist_itself));
-    if (!mountlist || !raidlist) {
-        fatal_error("Cannot malloc() mountlist and/or raidlist");
-    }
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     strcpy(bkpinfo->restore_path, "/");
@@ -966 +964 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(old_restpath);
-    free(mountlist);
-    free(raidlist);
+    mr_free(old_restpath);
+    mr_free(mountlist);
+    mr_free(raidlist);
     return (retval);
 }
@@ -1038 +1036 @@
 
     pathname_of_last_file_restored[0] = '\0';
-    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
-        fatal_error("Cannot malloc bigblk");
-    }
+    bigblk = mr_malloc(TAPE_BLOCK_SIZE);
 
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
@@ -1295 +1291 @@
         utime(outfile_fname, ubuf);
     }
-    paranoid_free(bigblk);
-    paranoid_free(checksum);
-    paranoid_free(outfile_fname);
-    paranoid_free(tmp);
-    paranoid_free(bzip2_command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(suffix);
-    paranoid_free(sz_devfile);
+    mr_free(bigblk);
+    mr_free(checksum);
+    mr_free(outfile_fname);
+    mr_free(tmp);
+    mr_free(bzip2_command);
+    mr_free(ntfsprog_command);
+    mr_free(suffix);
+    mr_free(sz_devfile);
 
     return (retval);
@@ -1553 +1549 @@
     }
 
-    paranoid_free(tmp);
-    paranoid_free(outfile_fname);
-    paranoid_free(command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(sz_devfile);
-    paranoid_free(ntfsprog_fifo);
+    mr_free(tmp);
+    mr_free(outfile_fname);
+    mr_free(command);
+    mr_free(ntfsprog_command);
+    mr_free(sz_devfile);
+    mr_free(ntfsprog_fifo);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1786 +1782 @@
 
   leave_sub:
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(executable);
-    paranoid_free(temp_log);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(filelist_name);
+    mr_free(filelist_subset_fname);
+    mr_free(executable);
+    mr_free(temp_log);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
     log_msg(5, "Leaving");
     return (retval);
@@ -1988 +1984 @@
     unlink(afio_fname);
 
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(filelist_fname);
-    paranoid_free(afio_fname);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(filelist_subset_fname);
+    mr_free(filelist_fname);
+    mr_free(afio_fname);
+    mr_free(command);
+    mr_free(tmp);
     return (retval);
 }
@@ -2137 +2133 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(tmp);
-    paranoid_free(biggies_whose_EXATs_we_should_set);
-    paranoid_free(pathname_of_last_biggie_restored);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(tmp);
+    mr_free(biggies_whose_EXATs_we_should_set);
+    mr_free(pathname_of_last_biggie_restored);
     return (retval);
 }
@@ -2286 +2282 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(comment);
+    mr_free(tmp);
+    mr_free(tarball_fname);
+    mr_free(progress_str);
+    mr_free(comment);
 
     return (retval);
@@ -2457 +2453 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(biggies_whose_EXATs_we_should_set);
-    paranoid_free(pathname_of_last_biggie_restored);
-    paranoid_free(biggie_fname);
-    paranoid_free(biggie_cksum);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(tmp);
+    mr_free(biggies_whose_EXATs_we_should_set);
+    mr_free(pathname_of_last_biggie_restored);
+    mr_free(biggie_fname);
+    mr_free(biggie_cksum);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(tmp);
     return (retval);
 }
@@ -2603 +2599 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
-    paranoid_free(progress_str);
-    paranoid_free(tmp_fname);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(tmp);
+    mr_free(progress_str);
+    mr_free(tmp_fname);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
     return (retval);
 }
@@ -2692 +2688 @@
     kill_petris();
     log_msg(2, "restore_everything() --- leaving");
-    paranoid_free(cwd);
-    paranoid_free(newpath);
-    paranoid_free(tmp);
+    mr_free(cwd);
+    mr_free(newpath);
+    mr_free(tmp);
     return (resA + resB);
 }
@@ -2914 +2910 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    if (!
-        (bkpinfo = g_bkpinfo_DONTUSETHIS =
-         malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
-    if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc mountlist");
-    }
-    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc raidlist");
-    }
+    bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo));
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     malloc_libmondo_global_strings();
@@ -3344 +3332 @@
     sprintf(tmp, "umount %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
-    paranoid_free(mountlist);
-    paranoid_free(raidlist);
+    mr_free(mountlist);
+    mr_free(raidlist);
     if (am_I_in_disaster_recovery_mode()) {
         run_program_and_log_output("mount / -o remount,rw", 2);
@@ -3351 +3339 @@
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)
-    paranoid_free(a);
-    paranoid_free(b);
-    paranoid_free(tmp);
+    mr_free(a);
+    mr_free(b);
+    mr_free(tmp);
 
     unlink("/tmp/filelist.full");