Changeset 2632 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

Timestamp:

May 13, 2010, 4:16:36 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Improve display of messages (removes extra \n) and replace a stract with "" with " ". trying to debug #421

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (3 diffs)

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

@@ -1923 +1923 @@
     while (DSFptr != NULL) {
         if (DSFptr->check) {
-            log_msg (4, "%s is mounted on %s and is on disk %s\n", DSFptr->device, DSFptr->mount_point, ndsf);
+            log_msg (4, "%s is mounted on %s and is on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*included_dsf_list, DSFptr->mount_point);
             strcat(*included_dsf_list, " ");
         } else {
-            log_msg (4, "%s is mounted on %s and is NOT on disk %s\n", DSFptr->device, DSFptr->mount_point, ndsf);
+            log_msg (4, "%s is mounted on %s and is NOT on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*excluded_dsf_list, DSFptr->mount_point);
             strcat(*excluded_dsf_list, " ");
@@ -1970 +1970 @@
         if (mode == 'E') {
             if (strlen(mounted_on_dsf)) {
-                log_to_screen("Excluding the following file systems on %s:\n", token);
-                log_to_screen("  %s\n", mounted_on_dsf);
+                log_to_screen("Excluding the following file systems on %s:", token);
+                log_to_screen("==> %s", mounted_on_dsf);
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
                 strcat(bkpinfo->exclude_paths, " ");
@@ -1979 +1979 @@
             }
         } else {
-            log_to_screen("Archiving only the following file systems on %s:\n", token);
-            log_to_screen("  %s\n", mounted_on_dsf);
+            log_to_screen("Archiving only the following file systems on %s:", token);
+            log_to_screen("==> %s\n", mounted_on_dsf);
             strcpy(bkpinfo->include_paths, "/");
             if (strlen(not_mounted_on_dsf)) {
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
-                log_to_screen("Not archiving the following file systems:\n");
-                log_to_screen("  %s\n", not_mounted_on_dsf);
+                log_to_screen("Not archiving the following file systems:");
+                log_to_screen("==> %s", not_mounted_on_dsf);
                 strcat(bkpinfo->exclude_paths, " ");
                 strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, "");
+                strcat(bkpinfo->exclude_paths, " ");
             }
         }