Changeset 2327 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c

Timestamp:

Aug 18, 2009, 3:20:37 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3338@localhost: bruno | 2009-08-11 23:03:30 +0200
bkpinfo->zip_suffix, bkpinfo->image_devs and bkpinfo->restore_path are now allocated dynmically

File:

• branches/2.2.10/mondo/src/common/libmondo-verify.c (modified) (14 diffs)

branches/2.2.10/mondo/src/common/libmondo-verify.c

@@ -55 +55 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
-            bkpinfo->zip_suffix);
+    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno, bkpinfo->zip_suffix);
     if (!does_file_exist(output)) {
-        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
-                bkpinfo->zip_suffix);
+        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno, bkpinfo->zip_suffix);
     }
     return (output);
@@ -216 +214 @@
     char *command = NULL;
     char *mds = NULL;
-    char *sz_exe;
+    char *sz_exe = NULL;
     static char *bufblkA = NULL;
     static char *bufblkB = NULL;
@@ -237 +235 @@
     int retval = 0;
 
-    malloc_string(sz_exe);
     if (!bufblkA) {
         if (!(bufblkA = malloc(maxbufsize))) {
@@ -254 +251 @@
     if (bkpinfo->compression_level > 0) {
         if (bkpinfo->use_lzo) {
-            strcpy(sz_exe, "lzop");
+            mr_asprintf(sz_exe, "lzop");
         } else if (bkpinfo->use_gzip) {
-            strcpy(sz_exe, "gzip");
+            mr_asprintf(sz_exe, "gzip");
         } else {
-            strcpy(sz_exe, "bzip2");
-        }
-    } else {
-        sz_exe[0] = '\0';
+            mr_asprintf(sz_exe, "bzip2");
+        }
     }
 
@@ -289 +284 @@
         // handle slices until end of CD
         if (slice_num == 0) {
-            log_msg(2, "ISO=%d  bigfile=%ld --START--",
-                    g_current_media_number, bigfile_num);
+            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"))) {
                 log_msg(2, "Cannot open bigfile's info file");
@@ -299 +293 @@
                 paranoid_fclose(fin);
             }
-            mr_asprintf(tmp, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
-            log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
-            forig = fopen(tmp, "r");
-            mr_free(tmp);
-
-            if (!forig) {
-                log_msg(2, "Failed to open bigfile. Darn.");
-                log_to_screen("%s/%s not found on live filesystem",
-                            bkpinfo->restore_path,
-                            biggiestruct.filename);
-                mr_asprintf(tmp, "echo \"%s/%s not found\" >> %s/biggies.changed", bkpinfo->restore_path, biggiestruct.filename, bkpinfo->tmpdir);
-                system(tmp);
+            if (bkpinfo->restore_path) {
+                mr_asprintf(tmp, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
+                log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
+                forig = fopen(tmp, "r");
                 mr_free(tmp);
-
-                bigfile_num++;
-                slice_num = 0;
-                retval++;
+    
+                if (!forig) {
+                    log_msg(2, "Failed to open bigfile. Darn.");
+                    log_to_screen("%s/%s not found on live filesystem", bkpinfo->restore_path, biggiestruct.filename);
+                    mr_asprintf(tmp, "echo \"%s/%s not found\" >> %s/biggies.changed", bkpinfo->restore_path, biggiestruct.filename, bkpinfo->tmpdir);
+                    system(tmp);
+                    mr_free(tmp);
+
+                    bigfile_num++;
+                    slice_num = 0;
+                    retval++;
+                } else {
+                    slice_num++;
+                }
             } else {
-                slice_num++;
+                log_it("Unable to open bigfile as restore_path is NULL");
             }
         } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
@@ -327 +323 @@
             slice_num = 0;
         } else {
-            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld",
-                    g_current_media_number, bigfile_num, slice_num);
-            if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld", g_current_media_number, bigfile_num, slice_num);
+            if ((!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) && (sz_exe != NULL)) {
                 mr_asprintf(command, "%s -dc %s 2>> %s", sz_exe, slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix), MONDO_LOGFILE);
             } else {
@@ -376 +371 @@
     }
     mr_free(mountpoint);
+    mr_free(sz_exe);
+
     last_bigfile_num = bigfile_num;
     last_slice_num = slice_num - 1;
@@ -388 +385 @@
         paranoid_free(bufblkB);
     }
-    paranoid_free(sz_exe);
     return (0);
 }
@@ -435 +431 @@
         mr_free(bkpinfo->zip_exe);
         mr_asprintf(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
         bkpinfo->use_gzip = FALSE;
@@ -443 +440 @@
         mr_free(bkpinfo->zip_exe);
         mr_asprintf(bkpinfo->zip_exe, "gzip");
-        strcpy(bkpinfo->zip_suffix, "gz");
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_suffix, "gz");
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = TRUE;
@@ -451 +449 @@
         mr_free(bkpinfo->zip_exe);
         mr_asprintf(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = FALSE;
+    }
+    if (bkpinfo->zip_exe == NULL) {
+        mr_asprintf(bkpinfo->zip_exe, "none");
+    }
+    if (bkpinfo->zip_suffix == NULL) {
+        mr_asprintf(bkpinfo->zip_suffix, "");
     }
     unlink(outlog);
@@ -686 +691 @@
  * Verify all afioballs from the opened tape/CD stream.
  * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->restore_path
  * - @c bkpinfo->tmpdir
  *
@@ -880 +884 @@
         mr_free(comment);
 
-        mr_asprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
-        res = verify_a_biggiefile_from_stream(logical_fname, size);
-        mr_free(logical_fname);
-
-        retval += res;
+        if (bkpinfo->restore_path) {
+            mr_asprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
+            res = verify_a_biggiefile_from_stream(logical_fname, size);
+            mr_free(logical_fname);
+            retval += res;
+        } else {
+            log_it("Unable to verify bigfile as restore_path is NULL");
+        }
+
         current_biggiefile_number++;
         g_current_progress++;