Changeset 1236 in MondoRescue for branches/2.2.2/mondo/src/common/libmondo-archive.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-archive.c (modified) (5 diffs)

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