Changeset 688 in MondoRescue for trunk/mondo/mondo/common/libmondo-verify.c

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

• trunk/mondo/mondo/common/libmondo-verify.c (modified) (10 diffs)

trunk/mondo/mondo/common/libmondo-verify.c

@@ -5 +5 @@
  * Functions for verifying backups (booted from hard drive, not CD).
  */
+
+#include <unistd.h>
 
 #include "my-stuff.h"
@@ -59 +61 @@
 
     asprintf(&afio_found_changes, "%s.afio", ignorefiles_fname);
-    paranoid_system("sync");
+    sync();
 
 /*  sprintf (command,
@@ -193 +195 @@
 {
 
-    /*@ buffer ********************************************************** */
-    char *tmp;
-    char *mountpoint;
-//  char ca, cb;
-    char *command;
-    char *sz_exe;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    char *mountpoint = NULL;
+    char *command = NULL;
+    char *sz_exe = NULL;
     static char *bufblkA = NULL;
     static char *bufblkB = NULL;
     const long maxbufsize = 65536L;
-    long currsizA = 0;
-    long currsizB = 0;
-    long j;
-
-    /*@ long ************************************************************ */
-    long bigfile_num = 0;
+    long currsizA = 0L;
+    long currsizB = 0L;
+    long j = 0L;
+    long bigfile_num = 0L;
     long slice_num = -1;
-    int res;
+    int res = 0;
 
     static FILE *forig = NULL;
@@ -215 +215 @@
     static long last_bigfile_num = -1;
     static long last_slice_num = -1;
-    FILE *pin;
-    FILE *fin;
+    FILE *pin = NULL;
+    FILE *fin = NULL;
     int retval = 0;
-//  long long outlen;
-
-    malloc_string(sz_exe);
+
     if (!bufblkA) {
         if (!(bufblkA = malloc(maxbufsize))) {
@@ -251 +249 @@
     open_evalcall_form(tmp);
     paranoid_free(tmp);
+
     iamhere("after vsbf");
     asprintf(&mountpoint, "%s/archives", mtpt);
@@ -263 +262 @@
         slice_num = last_slice_num + 1;
     }
-    while (does_file_exist
-           (slice_fname
-            (bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
-           ||
-           does_file_exist(slice_fname
-                           (bigfile_num, slice_num, mountpoint, ""))) {
-// handle slices until end of CD
+
+    tmp = slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix);
+    tmp1 = slice_fname(bigfile_num, slice_num, mountpoint, "");
+    while (does_file_exist(tmp) || does_file_exist(tmp1)) {
+        // handle slices until end of CD
         if (slice_num == 0) {
             log_msg(2, "ISO=%d  bigfile=%ld --START--",
                     g_current_media_number, bigfile_num);
-            if (!
-                (fin =
-                 fopen(slice_fname(bigfile_num, slice_num, mountpoint, ""),
-                       "r"))) {
+            if (!(fin = fopen(tmp1,"r"))) {
                 log_msg(2, "Cannot open bigfile's info file");
             } else {
@@ -286 +280 @@
                 paranoid_fclose(fin);
             }
-            asprintf(&tmp, "%s/%s", bkpinfo->restore_path,
+            asprintf(&tmp2, "%s/%s", bkpinfo->restore_path,
                      biggiestruct.filename);
-            log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
-            if (!(forig = fopen(tmp, "r"))) {
+            log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp2);
+            if (!(forig = fopen(tmp2, "r"))) {
                 log_msg(2, "Failed to open bigfile. Darn.");
                 retval++;
             }
-            paranoid_free(tmp);
+            paranoid_free(tmp2);
 
             slice_num++;
-        } else if (does_file_exist
-                   (slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+        } else if (does_file_exist(tmp1)) {
             log_msg(2, "ISO=%d  bigfile=%ld ---END---",
                     g_current_media_number, bigfile_num);
@@ -307 +300 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (bkpinfo->compression_level > 0) {
-                asprintf(&command, "%s -dc %s 2>> %s", sz_exe,
-                         slice_fname(bigfile_num, slice_num, mountpoint,
-                                     bkpinfo->zip_suffix),
-                         MONDO_LOGFILE);
+                asprintf(&command, "%s -dc %s 2>> %s", sz_exe, tmp, MONDO_LOGFILE);
             } else {
-                asprintf(&command, "cat %s",
-                         slice_fname(bigfile_num, slice_num, mountpoint,
-                                     bkpinfo->zip_suffix));
+                asprintf(&command, "cat %s", tmp);
             }
             if ((pin = popen(command, "r"))) {
@@ -356 +344 @@
         }
     }
+    paranoid_free(tmp);
+    paranoid_free(tmp1);
     paranoid_free(mountpoint);
     paranoid_free(sz_exe);
@@ -1072 +1062 @@
 
     /* find the final blocks */
-    paranoid_system("sync");
+    sync();
     sleep(2);
     closein_tape(bkpinfo);