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

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

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (3 diffs)
• mondo-rstr-newt.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (5 diffs)
• mondorestore.c (modified) (11 diffs)
• mr-externs.h (modified) (1 diff)

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

@@ -90 +90 @@
         newtRefresh();
     }
-    if (checksum == NULL]) {
+    if (checksum == NULL) {
         log_msg(2, "Warning - %s has no checksum", bigfile_fname);
     }
@@ -235 +235 @@
     char *tmp = NULL;
     char *archiver_exe = NULL;
-    char *tmp1 = NULL;
     char *logfile = NULL;
     char *compressor_exe = NULL;
@@ -241 +240 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%d", current_tarball_number);
 
     if (strstr(tarball_fname, ".bz2")) {

branches/3.2/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2632 +2632 @@
     char sz_res[MAX_STR_LEN];
     char *header_text = NULL;
-    char *p = NULL;
 
   /** int **************************************************************/
@@ -2736 +2735 @@
         memcpy((void *) disklist, (void *) bkp_disklist, sizeof(struct list_of_disks));
     }
-    paranoid_free(sz_res);
     mr_free(bkp_raidrec);
     mr_free(bkp_disklist);

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

@@ -639 +639 @@
 /** add mallocs **/
 char value[MAX_STR_LEN];
-char *tmp = NULL;
 char *tmp1 = NULL;
 char *envtmp1 = NULL;
@@ -936 +935 @@
             log_it("command = %s", command);
             log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-            mr_strcpy(iso_mnt, call_program_and_get_last_line_of_output(command));
+            sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
         } else {
-            mr_asprintf(iso_mnt, "/tmp/isodir");
+            sprintf(iso_mnt, "/tmp/isodir");
             mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
             run_program_and_log_output(tmp1, 5);
@@ -979 +978 @@
 }
 g_backup_media_type = bkpinfo->backup_media_type;
-paranoid_free(value);
-paranoid_free(iso_mnt);
-paranoid_free(iso_path);
 return (0);
 
@@ -2053 +2049 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_sprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(command,    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2103 +2099 @@
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    mr _asprintf(command, "mkdir -p %s", mountpt);
+    mr_asprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
     mr_free(command);

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;

branches/3.2/mondo/src/mondorestore/mr-externs.h

@@ -9 +9 @@
 #define BIGGIELIST MNT_CDROM"/archives/biggielist.txt"
 #define ARCHIVES_PATH MNT_CDROM"/archives"
+/*
 #define BIGGIELIST ARCHIVES_PATH"/biggielist.txt"
+*/
 
 #ifdef __FreeBSD__