Changeset 1236 in MondoRescue for branches/2.2.2/mondo/src/common/libmondo-files.c

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

File:

• branches/2.2.2/mondo/src/common/libmondo-files.c (modified) (4 diffs)

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);
         }