Changeset 3610 in MondoRescue for branches/3.2/mondo/src/common/libmondo-cli.c

Timestamp:

Nov 5, 2016, 6:12:23 PM (7 years ago)

Author:

Bruno Cornec

Message:

• Change interfaces for the call_program_and_get_last_line_of_output and where_is_root_mounted(now return dynamically allocated string)
• removes useless function store_netfs_config

File:

• branches/3.2/mondo/src/common/libmondo-cli.c (modified) (2 diffs)

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

@@ -464 +464 @@
             mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
         }
-        strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp1), MAX_STR_LEN / 4);
+        tmp2 = call_program_and_get_last_line_of_output(tmp1);
         mr_free(tmp1);
+        strncpy(bkpinfo->isodir, tmp2, MAX_STR_LEN / 4);
+        mr_free(tmp2);
 
         log_msg(3, "proto = %s", bkpinfo->netfs_proto);
@@ -511 +513 @@
                     mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 }
-                strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp1), MAX_STR_LEN / 4);
+                tmp2 = call_program_and_get_last_line_of_output(tmp1);
+                strncpy(bkpinfo->isodir, tmp2, MAX_STR_LEN / 4);
+                mr_free(tmp2);
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;