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

Timestamp:

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

Author:

Bruno Cornec

Message:

manages isodir dynamically

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-cli.c (modified) (4 diffs)
• libmondo-devices.c (modified) (4 diffs)
• libmondo-tools.c (modified) (1 diff)
• newt-specific.c (modified) (1 diff)

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

@@ -408 +408 @@
 
     if (flag_set['n']) {
-        mr_free(bkpinfo->netfs_mount);
         mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            mr_free(bkpinfo->netfs_remote_dir);
             mr_asprintf(bkpinfo->netfs_remote_dir, "/");
-            strncpy(bkpinfo->isodir, ".", MAX_STR_LEN / 4);
+            mr_asprintf(bkpinfo->isodir, "%s", ".");
         }
         /* test for protocol */
@@ -466 +464 @@
             mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
         }
-        tmp2 = call_program_and_get_last_line_of_output(tmp1);
+        mr_free(bkpinfo->isodir);
+        bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1);
         mr_free(tmp1);
-        strncpy(bkpinfo->isodir, tmp2, (MAX_STR_LEN / 4)-1);
-        mr_free(tmp2);
 
         log_msg(3, "proto = %s", bkpinfo->netfs_proto);
@@ -515 +512 @@
                     mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 }
-                tmp2 = call_program_and_get_last_line_of_output(tmp1);
-                strncpy(bkpinfo->isodir, tmp2,(MAX_STR_LEN / 4)-1);
-                mr_free(tmp2);
+                mr_free(bkpinfo->isodir);
+                bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1);
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
@@ -688 +684 @@
     if (flag_set['d']) {        /* backup directory (if ISO/NETFS) */
         if (flag_set['i']) {
-            strncpy(bkpinfo->isodir, flag_val['d'],(MAX_STR_LEN / 4)-1);
+            mr_asprintf(bkpinfo->isodir, "%s", flag_val['d']);
             sprintf(tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, 2)) {

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) {

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

@@ -832 +832 @@
     bkpinfo->disaster_recovery = am_I_in_disaster_recovery_mode();
     if (bkpinfo->disaster_recovery) {
-        strcpy(bkpinfo->isodir, "/");
+        mr_asprintf(bkpinfo->isodir, "%s", "/");
     } else {
-        strcpy(bkpinfo->isodir, MONDO_CACHE);
-    }
-    strcpy(bkpinfo->prefix, STD_PREFIX);
+        mr_asprintf(bkpinfo->isodir, "%s", MONDO_CACHE);
+    }
+    mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
     bkpinfo->optimal_set_size = 0L;
     bkpinfo->backup_media_type = none;

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

@@ -442 +442 @@
         mr_free(bkpinfo->scratchdir);
         mr_free(bkpinfo->prefix);
+        mr_free(bkpinfo->isodir);
         /* Then free the structure */
         paranoid_free(bkpinfo);