Changeset 3836 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

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

Author:

Bruno Cornec

Message:

manages isodir dynamically

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (4 diffs)

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

@@ -1354 +1354 @@
         log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/")) && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        if ((bkpinfo->isodir == NULL) || !strcmp(bkpinfo->isodir, "/"))) && am_I_in_disaster_recovery_mode()) {
+            mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
@@ -2499 +2499 @@
             }
             mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp1);
-            tmp = call_program_and_get_last_line_of_output(command);
-            strcpy(bkpinfo->isodir, tmp);
-            mr_free(tmp);
+            mr_free(bkpinfo->isodir);
+            bkpinfo->isodir = call_program_and_get_last_line_of_output(command);
             mr_free(command);
 
@@ -2566 +2565 @@
         log_msg(3, "Testing mount for %s", bkpinfo->netfs_mount);
         if (is_this_device_mounted(bkpinfo->netfs_mount)) {
-            tmp = call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1");
-            strcpy(bkpinfo->isodir, tmp);
-            mr_free(tmp);
+            mr_free(bkpinfo->isodir);
+            bkpinfo->isodir = call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1");
         } else {
             // Why netfsdir ?
-            snprintf(bkpinfo->isodir, (MAX_STR_LEN / 4) -1, "%s/netfsdir", bkpinfo->tmpdir);
+            mr_asprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -2639 +2637 @@
     case iso:
         if (!bkpinfo->disaster_recovery) {
-            if (!popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir,(MAX_STR_LEN / 4)-1)) {
+            tmp = mr_popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir);
+            if (tmp == NULL) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
+            } else {
+                mr_free(bkpinfo->isodir);
+                bkpinfo->isodir = tmp;
             }
             if (archiving_to_media) {