Changeset 3193 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondorestore.c

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

• branches/3.1/mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)

branches/3.1/mondo/src/mondorestore/mondorestore.c

@@ -582 +582 @@
                     log_msg(1, "Restoring subset");
                     retval += restore_everything(filelist);
+                    free_filelist(filelist);
                 } else {
                     mr_free(bkpinfo->restore_path);
@@ -839 +840 @@
                         "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
-    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
-    mr_free(tmp);
+    mr_free(tmp1);
     if (res) {
         log_to_screen("label-partitions-as-necessary returned an error");
@@ -2045 +2046 @@
     int res;
     int attempts;
-    long current_tarball_number = 0;
+    long current_tarball_number = 0L;
     long max_val;
   /**malloc ***/
@@ -2620 +2621 @@
     mr_free(tmp1);
 
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
+
+
+
     /* Init GUI */
     setup_newt_stuff();         /* call newtInit and setup screen log */
@@ -2666 +2672 @@
 
     log_it("what time is it");
-
-    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
-    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
 
     /* Process command-line parameters */
@@ -2799 +2802 @@
         mount_boot_if_necessary();  /* for Gentoo users */
         log_msg(2, "Still here.");
-        /* Adding an initialisation in order to avoid to hndle NULL pointer later */
+        /* Adding an initialisation in order to avoid to handle NULL pointer later */
         mr_free(bkpinfo->restore_path);
         mr_asprintf(bkpinfo->restore_path, "%s", "/tmp");