Changeset 3835 in MondoRescue for branches

Timestamp:

Mar 5, 2024, 2:06:28 AM (4 months ago)

Author:

Bruno Cornec

Message:

manages prefix dynamically

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (3 diffs)
• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -682 +682 @@
 
     if (flag_set['p']) {
-        strncpy(bkpinfo->prefix, flag_val['p'],(MAX_STR_LEN / 4)-1);
+        mr_asprintf(bkpinfo->prefix, "%s", flag_val['p']);
         log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }

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

@@ -2625 +2625 @@
         bkpinfo->netfs_remote_dir = mr_strip_spaces(tmp1);
 
-        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix,(MAX_STR_LEN / 4)-1)) {
+        tmp = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
+        if (tmp == NULL) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = tmp;
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
         log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
@@ -2659 +2662 @@
             }
         }
-        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix,(MAX_STR_LEN / 4)-1)) {
+        tmp = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
+        if (tmp == NULL) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = tmp;
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
@@ -2888 +2894 @@
     log_it("media size = %ld", bkpinfo->media_size);
     log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
-    if (bkpinfo->prefix) {
+    if (bkpinfo->prefix != NULL) {
         log_it("prefix = %s", bkpinfo->prefix);
     }

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

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

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

@@ -687 +687 @@
         }
         if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
+            mr_asprintf(bkpinfo->prefix, "%s", value);
         } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
+            mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
         log_it("Setting Prefix to %s", bkpinfo->prefix);
@@ -706 +706 @@
         }
         if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                strcpy(bkpinfo->prefix,value);
+            mr_asprintf(bkpinfo->prefix, "%s", value);
         } else {
-                strcpy(bkpinfo->prefix,STD_PREFIX);
+            mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
         tmp1 = call_program_and_get_last_line_of_output("cat "CMDLINE);
@@ -718 +718 @@
                 fatal_error("no imgname variable in environment");
             }
-            strcpy(bkpinfo->prefix,envtmp1);
+            mr_asprintf(bkpinfo->prefix, "%s", envtmp1);
         }   
         mr_free(tmp1);