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

Timestamp:

Dec 6, 2013, 3:40:47 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix mondoarchive which now works in text mode. GUI mode still not working and crashing on first update for backup. Needs more

investigation in newt-specific.c

File:

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

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

@@ -2561 +2561 @@
         }
         if (bkpinfo->netfs_remote_dir == NULL) {
-            fatal_error("bkpinfo->netfs_remote_dir shold not be NULL");
+            fatal_error("bkpinfo->netfs_remote_dir should not be NULL");
         }
         strcpy(tmp1, bkpinfo->netfs_remote_dir);
@@ -2584 +2584 @@
         }
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
-
         log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
@@ -2688 +2687 @@
         bkpinfo->boot_loader = i;
 
-        mr_free(bkpinfo->include_paths);
-        strcpy(tmp1, "/");
+        if (bkpinfo->include_paths) {
+            strcpy(tmp1, bkpinfo->include_paths);
+            mr_free(bkpinfo->include_paths);
+        } else {
+            strcpy(tmp1, "/");
+        }
         if (!popup_and_get_string
             ("Backup paths",
@@ -2831 +2834 @@
     log_it("compression = %ld", bkpinfo->compression_level);
     log_it("exclude_path = %s", bkpinfo->exclude_paths);
-    log_it("include_path = %s", bkpinfo->include_paths);
+    if (bkpinfo->include_paths) {
+        log_it("include_path = %s", bkpinfo->include_paths);
+    }
 
     /* Handle devices passed in bkpinfo and print result */
@@ -3010 +3015 @@
  * The mountpoint (where it's mounted) will obviously be '/'.
  */
-char *where_is_root_mounted()
-{
-    /*@ buffers **************** */
-    static char tmp[MAX_STR_LEN];
+char *where_is_root_mounted() {
+
+/*@ buffers **************** */
+static char tmp[MAX_STR_LEN];
 
 
 #ifdef __FreeBSD__
-    strcpy(tmp, call_program_and_get_last_line_of_output
-           ("mount | grep \" on / \" | cut -d' ' -f1"));
+    strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
 #else
-    strcpy(tmp, call_program_and_get_last_line_of_output
-           ("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
+    strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
     if (strstr(tmp, "/dev/cciss/")) {
-        strcpy(tmp, call_program_and_get_last_line_of_output
-               ("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
+        strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
     }
     if (strstr(tmp, "/dev/md")) {
-        strcpy(tmp,
-               call_program_and_get_last_line_of_output
-               ("mount | grep \" on / \" | cut -d' ' -f1"));
-    }
-#endif
-
-    return (tmp);
+        strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1"));
+    }
+#endif
+
+return (tmp);
 }