Changeset 3828 in MondoRescue for branches

Timestamp:

Mar 4, 2024, 4:52:07 PM (15 months ago)

Author:

Bruno Cornec

Message:

manages restore_path dynamically

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-tools.c (modified) (1 diff)
• common/libmondo-verify.c (modified) (2 diffs)
• common/mondostructures.h (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (9 diffs)

branches/3.3/mondo/src/common/libmondo-tools.c

@@ -850 +850 @@
     bkpinfo->include_paths = NULL;
     bkpinfo->exclude_devs = NULL;
-    bkpinfo->restore_path[0] = '\0';
+    bkpinfo->restore_path = NULL;
     bkpinfo->call_before_iso = NULL;
     bkpinfo->call_make_iso = NULL;

branches/3.3/mondo/src/common/libmondo-verify.c

@@ -295 +295 @@
                 paranoid_fclose(fin);
             }
-            if (bkpinfo->restore_path) {
+            if (bkpinfo->restore_path != NULL) {
                 mr_asprintf(tmp, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
                 log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
@@ -869 +869 @@
         mr_free(comment);
 
-        if (bkpinfo->restore_path) {
+        if (bkpinfo->restore_path != NULL) {
             mr_asprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
             res = verify_a_biggiefile_from_stream(logical_fname, size);

branches/3.3/mondo/src/common/mondostructures.h

@@ -535 +535 @@
    * without overwriting the old ones. Ignored during a backup.
    */
-    char restore_path[MAX_STR_LEN];
+    char *restore_path;
 
   /**

branches/3.3/mondo/src/common/newt-specific.c

@@ -435 +435 @@
         mr_free(bkpinfo->call_after_iso);
         mr_free(bkpinfo->call_before_iso);
+        mr_free(bkpinfo->restore_path);
         /* Then free the structure */
         paranoid_free(bkpinfo);

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -1854 +1854 @@
     log_msg(2, "interactive_mode --- starting (great, assertions OK)");
 
-    malloc_string(tmp);
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
@@ -1962 +1961 @@
                 if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
                     retval++;
-                    goto end_of_func;
+                    log_it("Leaving interactive_mode()");
+                    return (retval);
                 }
             }
@@ -1972 +1972 @@
         unmount_all_devices(mountlist);
         retval++;
-        goto end_of_func;
+        log_it("Leaving interactive_mode()");
+        return (retval);
     }
 
@@ -1988 +1989 @@
              */
             if (filelist) {
-              gotos_suck:
-                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)) {
+                gotos_suck:
+                // (NB: MNT_RESTORING is where your filesystem is mounted now, by default)
+                tmp = mr_popup_and_get_string("Restore path", "Restore files to where?", old_restpath);
+                if (tmp != NULL) {
                     if (!strcmp(tmp, "/")) {
                         if (!ask_me_yes_or_no("Are you sure?")) {
+                            mr_free(tmp);
                             goto gotos_suck;
                         }
-                        tmp[0] = '\0';  // so we restore to [blank]/file/name :)
+                        mr_asprintf(tmp, "%s", ""); // so we restore to [blank]/file/name :)
                     }
-                    strcpy(bkpinfo->restore_path, tmp);
+                    mr_asprintf(bkpinfo->restore_path, "%s", tmp);
                     log_msg(1, "Restoring subset");
                     retval += restore_everything(filelist);
-                    free_filelist(filelist);
                 } else {
-                    strcpy(bkpinfo->restore_path, old_restpath);
-                    free_filelist(filelist);
+                    mr_free(bkpinfo->restore_path);
+                    mr_asprintf(bkpinfo->restore_path, "%s", old_restpath);
                 }
+                free_filelist(filelist);
                 if (!ask_me_yes_or_no("Restore another subset of your backup?")) {
                     done = TRUE;
@@ -2063 +2065 @@
     }
   end_of_func:
-    paranoid_free(tmp);
     log_it("Leaving interactive_mode()");
     return (retval);
@@ -2453 +2454 @@
 
     char *old_restpath = NULL;
+    char *tmp2 = NULL;
 
     struct mountlist_itself *mountlist = NULL;
@@ -2466 +2468 @@
     }
 
-    strcpy(bkpinfo->restore_path, "/");
+    mr_asprintf(bkpinfo->restore_path, "%s", "/");
     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.");
@@ -2496 +2498 @@
         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)) {
+        tmp2 = mr_popup_and_get_string("Restore path", "Restore files to where? ", bkpinfo->restore_path);
+        mr_free(bkpinfo->restore_path);
+        if (tmp2 == NULL) {
             log_it("Restoring everything");
             retval += restore_everything(filelist);
-            free_filelist(filelist);
-            strcpy(bkpinfo->restore_path, old_restpath);
+            mr_asprintf(bkpinfo->restore_path, "%s", old_restpath);
         } else {
-            free_filelist(filelist);
-        }
-        strcpy(bkpinfo->restore_path, old_restpath);
+            bkpinfo->restore_path = tmp2;
+        }
+        free_filelist(filelist);
         mr_free(old_restpath);
     } else {
@@ -2829 +2832 @@
 
         log_it("About to call load_mountlist and load_raidtab");
-        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+        mr_asprintf(bkpinfo->restore_path, "%s", MNT_RESTORING);
         read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
         retval = load_mountlist(mountlist, g_mountlist_fname);