Changeset 3836 in MondoRescue for branches/3.3/mondo/src/mondorestore

Timestamp:

Mar 5, 2024, 2:50:53 AM (18 months ago)

Author:

Bruno Cornec

Message:

manages isodir dynamically

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (7 diffs)
• mondorestore.c (modified) (1 diff)

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

@@ -252 +252 @@
  * @return TRUE if OK was pressed, FALSE otherwise.
  */
-bool
-get_isodir_info(char *isodir_device, char *isodir_format,
+bool get_isodir_info(char *isodir_device, char *isodir_format,
                 struct s_bkpinfo *bkpinfo, bool nuke_me_please)
 {
 
     bool HDD = FALSE;
+    char *tmp = NULL;
     /** initialize ********************************************************/
 
@@ -269 +269 @@
         strcpy(isodir_device, "/dev/");
     }
-    if (bkpinfo->isodir[0] == '\0') {
-        strcpy(bkpinfo->isodir, "/");
-    }
-    // TODO: Are we shure it does what it's expected to do here ?
+    if (bkpinfo->isodir[0] == NULL) {
+        mr_asprintf(bkpinfo->isodir, "%s", "/");
+    }
+    // TODO: Are we sure it does what it's expected to do here ?
     if (does_file_exist("/tmp/NETFS-SERVER-MOUNT")) {
         strcpy(isodir_device, last_line_of_file("/tmp/NETFS-SERVER-MOUNT"));
         strcpy(isodir_format, "netfs");
-        strcpy(bkpinfo->isodir, last_line_of_file("/tmp/ISO-DIR"));
+        mr_asprintf(bkpinfo->isodir, "%s", last_line_of_file("/tmp/ISO-DIR"));
     }
     if (nuke_me_please) {
@@ -287 +287 @@
                 HDD = TRUE;
             }
-            if (popup_and_get_string ("ISO Mode - path", "At what path on this device can the ISO files be found ?", bkpinfo->isodir, MAX_STR_LEN / 4)) {
+            tmp = mr_popup_and_get_string ("ISO Mode - path", "At what path on this device can the ISO files be found ?", bkpinfo->isodir);
+            if (tmp) {
                 strip_spaces(isodir_device);
                 strip_spaces(isodir_format);
-                strip_spaces(bkpinfo->isodir);
+                bkpinfo->isodir = mr_strip_spaces(tmp);
+                mr_free(tmp);
                 log_it("isodir_device = %s - isodir_format = %s - bkpinfo->isodir = %s", isodir_device, isodir_format, bkpinfo->isodir);
                 if (HDD) {
                     /*  We need an additional param */
                     mr_asprintf(bkpinfo->subdir, "%s", bkpinfo->isodir);
-                    strcpy(bkpinfo->isodir, "/tmp/isodir");
+                    mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
                     log_it("Now bkpinfo->isodir = %s and subdir = ", bkpinfo->isodir, bkpinfo->subdir);
                 }
@@ -326 +328 @@
 if (bkpinfo->disaster_recovery) {
     /* Don't let this clobber an existing bkpinfo->isodir */
-    if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, "/tmp/isodir");
+    if (bkpinfo->isodir == NULL) {
+        mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
     }
     mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
@@ -925 +927 @@
     */
     mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
-    read_cfg_var(cfg_file, "iso-mnt", iso_mnt);
-    read_cfg_var(cfg_file, "iso-dir", iso_path);
-    snprintf(bkpinfo->isodir, (MAX_STR_LEN / 4)-1, "%s%s", iso_mnt, iso_path);
-    if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, old_isodir);
-    }
+    if (read_cfg_var(cfg_file, "iso-mnt", iso_mnt) != 0) {
+        iso_mnt[0] = '\0';
+    }
+    if (read_cfg_var(cfg_file, "iso-dir", iso_path) != 0) {
+        iso_path[0] = '\0';
+    }
+    mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+    if (!strcmpbkpinfo->isodir,"") {
+        mr_asprintf(bkpinfo->isodir, "%s", old_isodir);
+    }
+
     if ((!bkpinfo->disaster_recovery) || (g_isodir_device[0] != '\0')) {
         if (strcmp(old_isodir, bkpinfo->isodir)) {
             log_it("user nominated isodir %s differs from archive, keeping user's choice: %s\n", bkpinfo->isodir, old_isodir );
-            strcpy(bkpinfo->isodir, old_isodir);
+            mr_asprintf(bkpinfo->isodir, "%s", old_isodir);
         }
     }
@@ -969 +976 @@
                 bkpinfo->backup_media_type = cdr;
                 mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom"); /* superfluous */
-                bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
+                mr_free(bkpinfo->isodir);
+                iso_mnt[0] = iso_path[0] = '\0';
                 if (mount_media()) {
                     mr_free(tmp1);
@@ -982 +990 @@
         /*  except when already done in iso_fiddly_bits */
         if ((bkpinfo->backup_media_type == iso) && (g_isodir_device[0] == '\0')) {
-            sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+            mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
         }
     }

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

@@ -2843 +2843 @@
             if ((bkpinfo->backup_media_type == netfs) && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
                 log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
-                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {