Changeset 3614 in MondoRescue for branches/3.2/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

mr_strip_spaces now returns a dynamically allocated string

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-devices.c (modified) (5 diffs)
• libmondo-fork-EXT.h (modified) (1 diff)
• libmondo-raid.c (modified) (2 diffs)
• libmondo-string.c (modified) (1 diff)
• newt-specific.c (modified) (2 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)) {

branches/3.2/mondo/src/common/libmondo-fork-EXT.h

@@ -1 +1 @@
 /* libmondo-fork-EXT.h */
 
-extern char *call_program_and_get_last_line_of_output(char *call);
+extern char *call_program_and_get_last_line_of_output(const char *call);
 extern int run_program_and_log_to_screen(char *basic_call,
                                          char *what_i_am_doing);

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

@@ -426 +426 @@
     char *incoming = NULL;
     char *p = NULL;
+    char *res = NULL;
 
     assert(fin != NULL);
@@ -433 +434 @@
     }
 
-    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
-        log_msg(10,"Found in raidtab line: %s",incoming);
-        mr_strip_spaces(incoming);
+    for (mr_getline(res, fin); !feof(fin); mr_getline(res, fin)) {
+        log_msg(10,"Found in raidtab line: %s",res);
+        incoming = mr_strip_spaces(res);
+        mr_free(res);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {

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

@@ -92 +92 @@
     }
     /*  skip initial spaces */
-    mr_asprintf(scratch, "%s", in);
-    mr_strip_spaces(scratch);
+    scratch = mr_strip_spaces(in);
     len = (int)strlen(scratch);
     mid = width / 2;

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

@@ -1234 +1234 @@
         static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
+        char *instr = NULL;
         t_bkptype backup_type;
         int i;
@@ -1256 +1257 @@
                 }
                 printf(")\n--> ");
-                mr_getline(outstr, stdin);
-                mr_strip_spaces(outstr);
+                mr_getline(instr, stdin);
+                outstr = mr_strip_spaces(instr);
+                mr_free(instr);
                 for (i = 0; possible_responses[i]; i++) {
                     if (!strcmp(possible_responses[i], outstr)) {