Changeset 3836 in MondoRescue for branches/3.3/mondo/src/common/libmondo-cli.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-cli.c (modified) (4 diffs)

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