Changeset 1627 in MondoRescue

Timestamp:

Sep 9, 2007, 2:12:49 AM (17 years ago)

Author:

Bruno Cornec

Message:

Some define cleanup in my-stuff.h

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (6 diffs)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (2 diffs)
• common/newt-specific.c (modified) (1 diff)
• include/my-stuff.h (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -1081 +1081 @@
         if (!does_file_exist(archiving_filelist_fname)) {
             mr_msg(3,
-                    "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
-                    FORTY_SPACES, getpid(), this_thread_no,
+                    "[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
+                    getpid(), this_thread_no,
                     archiving_set_no);
             break;
@@ -1090 +1090 @@
                  archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            mr_msg(4, "%s[%d:%d] - waiting for storer",
-                    FORTY_SPACES, getpid(), this_thread_no);
+            mr_msg(4, "[%d:%d] - waiting for storer",
+                     getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -1099 +1099 @@
         mr_free(tmp);
 
-        mr_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
+        mr_msg(4, "[%d:%d] - EXATing %d...", getpid(),
                 this_thread_no, archiving_set_no);
         if (g_getfattr) {
@@ -1114 +1114 @@
         }
 
-        mr_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
+        mr_msg(4, "[%d:%d] - archiving %d...", getpid(),
                 this_thread_no, archiving_set_no);
         res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
@@ -1141 +1141 @@
             fatal_error("Cannot get semaphore V");
         }
-        mr_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
+        mr_msg(4, "[%d:%d] - archived %d OK", getpid(),
                 this_thread_no, archiving_set_no);
         archiving_set_no++;
@@ -1152 +1152 @@
         fatal_error("Cannot get semaphore V");
     }
-    mr_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
+    mr_msg(3, "[%d:%d] - exiting", getpid(),
             this_thread_no);
     mr_free(archiving_filelist_fname);

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -1590 +1590 @@
         mr_msg(1, "Calculating filelist");
         snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media \
+" MNT_CDROM " /mnt/floppy /media \
 /proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
 

branches/stable/mondo/src/common/libmondo-tools.c

@@ -1035 +1035 @@
         run_program_and_log_output("mount " MNT_CDROM, FALSE);
     }
-    if (g_remount_floppy_at_end) {
-        run_program_and_log_output("mount " MNT_FLOPPY, FALSE);
-    }
 }
 
@@ -1049 +1046 @@
         g_remount_cdrom_at_end = TRUE;
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    }
-    if (run_program_and_log_output
-        ("mount | grep floppy | grep super", FALSE) == 0) {
-        g_remount_floppy_at_end = TRUE;
-        run_program_and_log_output("umount " MNT_FLOPPY, FALSE);
     }
 }

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

@@ -12 +12 @@
 
 #define MAX_NEWT_COMMENT_LEN 200
+#define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
 
 #include <stdio.h>

branches/stable/mondo/src/include/my-stuff.h

@@ -172 +172 @@
  */
 #define IS_THIS_A_STREAMING_BACKUP(x) (x == tape || x == udev || x == cdstream)
-
-/**
- * Welcome string displayed at the top of the newt interface.
- */
-#define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
 
 /**
@@ -283 +278 @@
 #define ARCH_THREADS 2          ///< The number of simultaneous threads running afio in the background.
 #define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
-#define FORTY_SPACES "                                         "    ///< 40 spaces.
 #define PPCFG_RAMDISK_SIZE 350  ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
-
-#define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
-
 
 /**
@@ -298 +289 @@
 
 #define MNT_CDROM "/mnt/cdrom"
-#define MNT_FLOPPY "/mnt/floppy"
 
 #endif                          /* _MY_STUFF_H_ */