Changeset 1236 in MondoRescue for branches/2.2.2/mondo/src/common

Timestamp:

Mar 12, 2007, 12:23:16 AM (17 years ago)

Author:

Bruno Cornec

Message:

Port from stable important patches for 2.2.2:
mindi-busybox:

• Improve Gentoo packaging

mindi:

• Better messages for analyze-my-lvm
• Add support for newer Qlogic drivers (qla2300 & 2400), mpt, dm and ohci
• Fix a bug in mindi for the FAILSAFE support
• PATH fixed for init in restore (/usr/games added for petris)
• Fiw a bug where restore failing because no archive files are found when -G is used
• /media is now completely excluded as per StandardsCompliance

mondo:

• Handle no compression + verify correctly
• various HOWTO fixes
• Fix temporarily a bug when a biggiefile > 32MB was compressed below the size

of a slice (16MB)

• Better module loading in insmod_crucial_modules
• Improve Gentoo packaging
• Small typo fix for mondorestore man page
• Small memory management improvements
• Store NFS config only once
• Fix a flaw in libmondo-mountlist.c (there since rev [1] !!)
• Increased MAX_STR_LEN to 384 to make it divisible without remainder by eight

for 64 bits platforms

• Fix a bug where no bzip2 format file would be found when supporting gzip
• CentOS fixes

Location:

branches/2.2.2/mondo/src/common

Files:

• libmondo-archive.c (modified) (5 diffs)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-files.c (modified) (4 diffs)
• libmondo-fork.c (modified) (2 diffs)
• libmondo-mountlist.c (modified) (3 diffs)
• libmondo-string.c (modified) (1 diff)
• libmondo-tools.c (modified) (2 diffs)
• libmondo-verify.c (modified) (4 diffs)
• my-stuff.h (modified) (1 diff)

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

@@ -2588 +2588 @@
     assert(bkpinfo != NULL);
     /* slice big files */
-    malloc_string(blah);
     malloc_string(biggielist);
     malloc_string(xattr_fname);
     malloc_string(acl_fname);
-    command = malloc(1200);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
@@ -2603 +2601 @@
     }
 
-    sprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+    asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
             biggielist);
     paranoid_system(command);
-    sprintf(blah, "biggielist = %s", biggielist);
+    paranoid_free(command);
+
+    asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
+    paranoid_free(blah);
 
     if (!does_file_exist(biggielist)) {
@@ -2615 +2616 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        sprintf(command, "cp %s %s/archives/", xattr_fname,
+        asprintf(&command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
         paranoid_system(command);
+        paranoid_free(command);
     }
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        sprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
+        asprintf(&command, "cp %s %s/archives/", acl_fname,
+             bkpinfo->scratchdir);
         paranoid_system(command);
+        paranoid_free(command);
     }
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
-        sprintf(blah, "%ld", count_lines_in_file(biggielist));
+        asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
+        paranoid_free(blah);
     }
     res = make_slices_and_images(bkpinfo, biggielist);
@@ -2649 +2654 @@
     return (retval);
 }
-
 
 
@@ -3474 +3478 @@
     strcpy(tmp, slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
     fout = fopen(tmp, "w");
+    if (fout == NULL) {
+        mr_msg(1, "Unable to open and write to %s\n", tmp);
+        paranoid_free(tmp);
+        paranoid_free(suffix);
+        return (1);
+    }
+
     (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
     paranoid_fclose(fout);

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

@@ -352 +352 @@
     assert(maxsetsizeK > 0);
 
-    max_sane_size_for_a_file = 32L * 1024L;
+    max_sane_size_for_a_file = 64L * 1024L;
 // max_sane_size_for_a_file = maxsetsizeK*2;
 //  if (max_sane_size_for_a_file > 32*1024)
@@ -1747 +1747 @@
         log_msg(1, "Calculating filelist");
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
+" MNT_CDROM " " MNT_FLOPPY " /media \
 /proc /sys /root/images/mondo /root/images/mindi ", 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/2.2.2/mondo/src/common/libmondo-files.c

@@ -1245 +1245 @@
     strcpy(nfs_server_ipaddr, tmp);
     strcpy(nfs_mount, p);
+
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     sprintf(command,
@@ -1417 +1418 @@
     char tmp[MAX_STR_LEN];
     char *p;
+    char *q = NULL;
+
+    q = strrchr(filename, '.');
+    if (q == NULL) {
+        return (FALSE);
+    }
 
     sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
@@ -1422 +1429 @@
         return (FALSE);
     }
-    strcpy(do_not_compress_these, last_line_of_file(tmp));
+    /* BERLIOS: This is just plain WRONG !! */
+    strcpy(do_not_compress_these,last_line_of_file(tmp));
+
     for (p = do_not_compress_these; p != NULL; p++) {
         strcpy(tmp, p);
@@ -1428 +1437 @@
             *(strchr(tmp, ' ')) = '\0';
         }
-        if (!strcmp(sz_last_suffix(filename), tmp)) {   /*printf("MATCH\n"); */
+        if (!strcmp(q, tmp)) {
             return (TRUE);
         }

branches/2.2.2/mondo/src/common/libmondo-fork.c

@@ -155 +155 @@
     }
     strip_spaces(result);
+    paranoid_free(tmp);
     return (result);
 }
@@ -201 +202 @@
     log_msg(3, "Starting");
     assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(basic_call);
+    // BERLIOS: doesn't work even if the string is correct !
+    //assert_string_is_neither_NULL_nor_zerolength(basic_call);
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);

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

@@ -58 +58 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 
 /*@unused@*/
@@ -369 +369 @@
         sprintf(tmp, " %ld MB unallocated on %s.",
                 physical_drive_size - amount_allocated, drive);
-        log_it(tmp), strcat(flaws_str, tmp);
+        log_it(tmp);
+        strcat(flaws_str, tmp);
+        /* BERLIOS: Flawed since rev 1 !! */
+        res++;
     }
     if (res) {
@@ -525 +528 @@
         sprintf(tmp, " %ld MB unallocated on %s.",
                 physical_drive_size - amount_allocated, drive);
-        log_it(tmp), strcat(flaws_str, tmp);
+        log_it(tmp);
+        strcat(flaws_str, tmp);
+        /* BERLIOS: Flawed since rev 1 !! */
+        res++;
     }
 

branches/2.2.2/mondo/src/common/libmondo-string.c

@@ -513 +513 @@
 
     input = malloc(2000);
-    assert_string_is_neither_NULL_nor_zerolength(ip);
+    // BERLIOS: seems to cause invalid errors 
+    //assert_string_is_neither_NULL_nor_zerolength(ip);
     assert_string_is_neither_NULL_nor_zerolength(token);
     assert(value != NULL);

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

@@ -459 +459 @@
 /**
  * Insert modules that Mondo requires.
- * Currently inserts @c dos, @c fat, @c vfat, and @c osst for Linux;
+ * Currently inserts @c msdos, @c vfat, and @c loop for Linux;
  * @c msdosfs and @c ext2fs for FreeBSD.
  */
@@ -468 +468 @@
     system("kldstat | grep ext2fs  || kldload ext2fs 2> /dev/null");
 #else
-    system("modprobe dos &> /dev/null");
-    system("modprobe fat &> /dev/null");
-    system("modprobe vfat &> /dev/null");
-    //  system("modprobe osst &> /dev/null");
+    system("modprobe -a msdos vfat loop &> /dev/null");
 #endif
 }

branches/2.2.2/mondo/src/common/libmondo-verify.c

@@ -369 +369 @@
            does_file_exist(slice_fname
                            (bigfile_num, slice_num, mountpoint, ""))) {
-// handle slices until end of CD
+        // handle slices until end of CD
         if (slice_num == 0) {
             log_msg(2, "ISO=%d  bigfile=%ld --START--",
@@ -391 +391 @@
             if (!(forig = fopen(tmp, "r"))) {
                 log_msg(2, "Failed to open bigfile. Darn.");
+                log_to_screen(_("%s/%s not found on live filesystem"),
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                asprintf(&tmp, "echo \"%s/%s not found\" >> /tmp/biggies.changed",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                system(tmp);
+                paranoid_free(tmp);
+
+                bigfile_num++;
+                slice_num = 0;
                 retval++;
+            } else {
+                slice_num++;
             }
-            slice_num++;
-        } else if (does_file_exist
-                   (slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+            paranoid_free(tmp2);
+        } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
+                   (length_of_file(slice_fname(bigfile_num, slice_num, mountpoint, "")) == 0)) {
             log_msg(2, "ISO=%d  bigfile=%ld ---END---",
                     g_current_media_number, bigfile_num);
@@ -402 +415 @@
             slice_num = 0;
         } else {
-            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld  \r",
+            mr_msg(2, "ISO=%d  bigfile=%ld  slice=%ld",
                     g_current_media_number, bigfile_num, slice_num);
-            if (bkpinfo->compression_level > 0) {
+            if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
                 sprintf(command, "%s -dc %s 2>> %s",
                         sz_exe,
-                        slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix),
+                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
                         MONDO_LOGFILE);
             } else {
-                sprintf(command, "cat %s",
-                        slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix));
+                sprintf(command, "cat %s 2>> %s",
+                        slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
             }
             if ((pin = popen(command, "r"))) {
@@ -435 +446 @@
                 }
                 paranoid_pclose(pin);
-                if (res && !strncmp(biggiestruct.filename, " /dev/", 5)) {
+                if (res && !strncmp(biggiestruct.filename, "/dev/", 5)) {
                     log_msg(3,
                             "Ignoring differences between %s and live filesystem because it's a device and therefore the archives are stored via ntfsclone, not dd.",

branches/2.2.2/mondo/src/common/my-stuff.h

@@ -266 +266 @@
 #define ARBITRARY_MAXIMUM 2000  ///< The maximum number of items showing at once in the mountlist or filelist editor.
 #define MAX_TAPECATALOG_ENTRIES 8192    ///< The maximum number of entries in the tape catalog.
-#define MAX_STR_LEN 380         ///< The maximum length of almost all @p char buffers in Mondo.
+#define MAX_STR_LEN 384         ///< The maximum length of almost all @p char buffers in Mondo.
+                                        ///  Note: Make this divisible by eight to avoid aligment issues
+                                        ///        on 64bit platforms like ia64.
 #define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
 #define MAXIMUM_ADDITIONAL_RAID_VARS 32 ///< The maximum number of additional RAID variables per RAID device in the raidlist.