Changeset 3614 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

Timestamp:

Nov 18, 2016, 5:31:43 PM (7 years ago)

Author:

Bruno Cornec

Message:

mr_strip_spaces now returns a dynamically allocated string

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -24 +24 @@
 #include "libmondo-stream-EXT.h"
 
-extern void mr_strip_spaces(char *);
-
-#include <sys/types.h>
 #ifdef __FreeBSD__
 #define DKTYPENAMES
@@ -1040 +1037 @@
     } else {
         mr_getline(p, pin);
-        mr_asprintf(good_formats, " %s",p);
+        good_formats = mr_strip_spaces(p);
         mr_free(p);
         (void)pclose(pin);
-        mr_strip_spaces(good_formats);
         mr_strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 ");  // " ntfs 7 " -- um, cheating much? :)
         if (strstr(good_formats, format_sz)) {
@@ -2461 +2457 @@
             }
             mr_free(bkpinfo->netfs_mount);
-            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
+            // check whether already mounted - we better remove
+            // surrounding spaces and trailing '/' for this
+            bkpinfo->netfs_mount = mr_strip_spaces(p);
             if (!bkpinfo->restore_data) {
                 if ((compression_type = which_compression_type()) == NULL) {
@@ -2473 +2471 @@
                 }
             }
-            // check whether already mounted - we better remove
-            // surrounding spaces and trailing '/' for this
-            mr_strip_spaces(bkpinfo->netfs_mount);
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
@@ -2607 +2602 @@
         }
         mr_free(bkpinfo->netfs_remote_dir);
-        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", tmp1);
-
         // check whether writable - we better remove surrounding spaces for this
-        mr_strip_spaces(bkpinfo->netfs_remote_dir);
+        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)) {