Changeset 3194 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c

Timestamp:

Sep 29, 2013, 7:27:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix all compilation/link error due to the previous giant merge with 3.1. 3.2 is ready to test

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (11 diffs)

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -431 +431 @@
   /** needs malloc **********/
     char *tmp;
-    char *p = NULL;
     char *tmp1 = NULL;
     char *fstab_fname = NULL;
@@ -460 +459 @@
     log_it("Done loading config file; resizing ML");
 
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE);
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
     if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
@@ -578 +577 @@
                 strcpy(tmp, old_restpath);
                 // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
-                if (popup_and_get_string
-                    ("Restore path", "Restore files to where?", tmp,
-                     MAX_STR_LEN / 4)) {
+                if (popup_and_get_string("Restore path", "Restore files to where?", tmp, MAX_STR_LEN / 4)) {
                     if (!strcmp(tmp, "/")) {
                         if (!ask_me_yes_or_no("Are you sure?")) {
@@ -788 +785 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
+            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
             if (strstr(tmp1, "nopart")) {
                 log_msg(2, "Not partitioning drives due to 'nopart' option.");
@@ -860 +857 @@
 
   after_the_nuke:
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
@@ -912 +909 @@
     strcpy(bkpinfo->restore_path, "/");
     if (!g_restoring_live_from_cd && !g_restoring_live_from_netfs) {
-        popup_and_OK
-            ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
+        popup_and_OK("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
     }
@@ -940 +936 @@
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
-        if (popup_and_get_string("Restore path",
-                                 "Restore files to where? )",
-                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
+        if (popup_and_get_string("Restore path", "Restore files to where? ", bkpinfo->restore_path, MAX_STR_LEN / 4)) {
             log_it("Restoring everything");
             retval += restore_everything(filelist);
@@ -958 +952 @@
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(2,
-                "Tape : I don't need to unmount or eject the CD-ROM.");
+        log_msg(2, "Tape : I don't need to unmount or eject the CD-ROM.");
     } else {
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
@@ -987 +980 @@
  * @{
  */
+
 /**
  * Restore biggiefile @p bigfileno from the currently mounted CD.
@@ -998 +992 @@
  * @return 0 for success (or skip), nonzero for failure.
  */
-int
-restore_a_biggiefile_from_CD(long bigfileno,
+int restore_a_biggiefile_from_CD(long bigfileno,
                              struct s_node *filelist,
                              char *pathname_of_last_file_restored)
@@ -2204 +2197 @@
   /** malloc add ****/
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *biggie_fname;
     char *biggie_cksum;