Changeset 1147 in MondoRescue for branches/stable/mondo

Timestamp:

Feb 12, 2007, 11:13:09 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix a flaw in libmondo-mountlist.c (there since rev [1] !!) dur to the change of log_it macro.

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (4 diffs)
• libmondo-mountlist.c (modified) (3 diffs)

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

@@ -2405 +2405 @@
     assert(bkpinfo != NULL);
     /* slice big files */
-    malloc_string(blah);
     malloc_string(biggielist);
     malloc_string(xattr_fname);
     malloc_string(acl_fname);
-    command = mr_malloc(1200);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
@@ -2420 +2418 @@
     }
 
-    sprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+    mr_asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
             biggielist);
     paranoid_system(command);
-    sprintf(blah, "biggielist = %s", biggielist);
+    mr_free(command);
+
+    mr_asprintf(&blah, "biggielist = %s", biggielist);
     mr_msg(2, blah);
+    mr_free(blah);
 
     if (!does_file_exist(biggielist)) {
@@ -2432 +2433 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        sprintf(command, "cp %s %s/archives/", xattr_fname,
+        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
         paranoid_system(command);
+        mr_free(command);
     }
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        sprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
+        mr_asprintf(&command, "cp %s %s/archives/", acl_fname,
+             bkpinfo->scratchdir);
         paranoid_system(command);
+        mr_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));
+        mr_asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
+        mr_free(blah);
     }
     res = make_slices_and_images(bkpinfo, biggielist);
@@ -2459 +2464 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    mr_free(blah);
     mr_free(biggielist);
-    mr_free(command);
     mr_free(xattr_fname);
     mr_free(acl_fname);
     return (retval);
 }
-
 
 

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

@@ -16 +16 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "mr_mem.h"
 #include "mr_msg.h"
@@ -329 +329 @@
         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) {
@@ -485 +488 @@
         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++;
     }