Changeset 1548 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Jul 24, 2007, 1:39:36 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Add the possibiilty to edit in interactive mode mtab and device.map for grub
• Remove blkid cache files after restore to avoid problems in cloning mode
• Fix what seems to appear a huge number of bugs in hack-fstab (illustration of 1 LOC = 1 bug :-)
• Especially improve LABEL and UUID support.
• Should fix #185
• Exclude_path should be 4*MAX_STR_LEN everywhere. Fixed now.
• Increasing that value will allow to having larger exclude paths.
• Should solve bug #137 (and maybe #3 as well)
• Adds support for fedora 7

(merge -r 1533:1547 $SVN_M/branches/2.2.5)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-fork.c (modified) (1 diff)
• libmondo-mountlist.c (modified) (1 diff)
• libmondo-stream.c (modified) (2 diffs)

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

@@ -1930 +1930 @@
             ("Exclude paths",
              "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.",
-             bkpinfo->exclude_paths, MAX_STR_LEN)) {
+             bkpinfo->exclude_paths, (4*MAX_STR_LEN)-1)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);

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

@@ -1525 +1525 @@
 
     malloc_string(sz_datefile);
-    malloc_string(exclude_paths);
+    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
+        fatal_error("Cannot malloc exclude_paths");
+    }
     malloc_string(g_skeleton_filelist);
     // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
@@ -1583 +1585 @@
         mr_msg(2, "include_paths = '%s'", include_paths);
         mr_msg(1, "Calculating filelist");
-        sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
+        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s . .. \
 " 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-fork.c

@@ -6 +6 @@
 #include "mr_msg.h"
 #include "mr_str.h"
+#include "mr_gettext.h"
 
 #include "mondostructures.h"

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

@@ -17 +17 @@
 #include "libmondo-string-EXT.h"
 #include "newt-specific-EXT.h"
+
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_gettext.h"
 
 /*@unused@*/

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

@@ -16 +16 @@
 #include "mr_msg.h"
 #include "mr_list.h"
+#include "mr_gettext.h"
 
 #include "mondostructures.h"
@@ -1352 +1353 @@
 int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo)
 {
-    int i, last, res = 0;
+    int res = 0;
     char *fname = NULL;
     struct mr_list_elt *elt = NULL;