Changeset 783 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c (modified) (7 diffs)

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -4 +4 @@
 
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -44 +44 @@
     char *p = NULL;
     int i = 0;
-    int n = 0;
+    size_t n = 0;
     int retval = 0;
 
@@ -258 +258 @@
         }
         paranoid_free(tmp);
+
         if (use_star) {
             if (strcmp(compressor_exe, "bzip2")) {
@@ -264 +265 @@
             }
         } else {
-            asprintf(&tmp, compressor_exe);
-            sprintf(compressor_exe, "-P %s -Z", tmp);
+            tmp = compressor_exe;
+            asprintf(&compressor_exe, "-P %s -Z", tmp);
             paranoid_free(tmp);
         }
@@ -299 +300 @@
         log_OS_error(command);
     }
+    paranoid_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
+        asprintf(&command,
                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);
+        paranoid_free(command);
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    paranoid_free(command);
 
     if (archiver_errors) {
@@ -353 +356 @@
 
     asprintf(&progress_str, _("Comparing with %s #%d "),
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
 
@@ -402 +405 @@
             paranoid_free(progress_str);
             asprintf(&progress_str, _("Comparing with %s #%d "),
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);