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

Timestamp:

Sep 29, 2013, 7:27:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix all compilation/link error due to the previous giant merge with 3.1. 3.2 is ready to test

File:

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

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

@@ -884 +884 @@
     if (!tmp[0]) {
         mr_free(tmp);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
     }
     if (tmp[0]) {
@@ -2400 +2400 @@
 
         /* Initiate bkpinfo netfs_mount path from running environment if not already done */
-        if (!bkpinfo->netfs_mount == NULL) {
-            mr_asprintf(bkpinfo->netfs_mount, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (bkpinfo->netfs_mount == NULL) {
+            mr_asprintf(bkpinfo->netfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -2417 +2417 @@
             }
             mr_free(bkpinfo->netfs_mount);
-            mr_asprintf(bkpinfo->netfs_mount, "%s", p;
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
             if (!bkpinfo->restore_data) {
                 if ((compression_type = which_compression_type()) == NULL) {
@@ -2448 +2448 @@
 
             if (!bkpinfo->restore_data) {
-                mr_sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);   // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
                 strcpy(tmp1, sz_size);
@@ -2496 +2496 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1)) {
+        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2556 +2556 @@
             finish(1);
         }
-        strcpy(bkpinfo->netfs_remote_dir, tmp1);
+        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", tmp1);
 
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces(bkpinfo->netfs_remote_dir);
+        mr_strip_spaces(bkpinfo->netfs_remote_dir);
 
         if (!popup_and_get_string
@@ -2820 +2820 @@
 
     /* Handle devices passed in bkpinfo and print result */
-    /*  the mr_make_devlist_from_pathlist function appends
+    /*  the mr_make_devlist_from_pathlist function appends */
     /*  to the *_paths variables so copy before */
     mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');