Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/libmondo-verify.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

• branches/3.0/mondo/src/common/libmondo-verify.c (modified) (52 diffs)

branches/3.0/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);
@@ -78 +80 @@
 {
     /*@ buffer ********************************************************** */
-    char *command = NULL;
-    char *afio_found_changes = NULL;
+    char *command;
+    char *afio_found_changes;
 
     /*@ int ************************************************************* */
@@ -87 +89 @@
     long afio_diffs = 0;
 
+    command = malloc(2000);
+    afio_found_changes = malloc(500);
     assert_string_is_neither_NULL_nor_zerolength(changedfiles_fname);
     assert_string_is_neither_NULL_nor_zerolength(ignorefiles_fname);
     assert_string_is_neither_NULL_nor_zerolength(stderr_fname);
 
-    mr_asprintf(afio_found_changes, "%s.afio", ignorefiles_fname);
-    sync();
+    sprintf(afio_found_changes, "%s.afio", ignorefiles_fname);
+    paranoid_system("sync");
+
+/*  sprintf (command,
+       "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
+       stderr_fname, afio_found_changes);
+*/
 
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
-    mr_asprintf(command, "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
+    sprintf(command,
+            "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s",
+            stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
-    mr_free(command);
-
     if (res) {
         log_msg(2, "Warning - failed to think");
@@ -105 +114 @@
 
     log_msg(1, "Now scanning log file for 'star: ' stuff");
-    mr_asprintf(command, "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
+    sprintf(command,
+            "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s",
+            stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
-    mr_free(command);
-
     if (res) {
         log_msg(2, "Warning - failed to think");
     }
+//  exclude_nonexistent_files (afio_found_changes);
     afio_diffs = count_lines_in_file(afio_found_changes);
-    mr_asprintf(command, "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s", ignorefiles_fname, afio_found_changes, afio_found_changes, changedfiles_fname);
-    mr_free(afio_found_changes);
+    sprintf(command,
+            "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
+            ignorefiles_fname, afio_found_changes, afio_found_changes,
+            changedfiles_fname);
     log_msg(2, command);
     paranoid_system(command);
-    mr_free(command);
+    paranoid_free(command);
+    paranoid_free(afio_found_changes);
     return (afio_diffs);
 }
@@ -138 +151 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp = NULL;
+    char *tmp;
     char *mds = NULL;
 
@@ -149 +162 @@
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
     assert(bkpinfo != NULL);
+    malloc_string(tmp);
 
     for (set_number = 0;
@@ -161 +175 @@
     if (g_last_afioball_number != set_number - 1) {
         if (set_number == 0) {
-            log_msg(1, "Weird error in verify_afioballs_on_CD() but it's really a cosmetic error, nothing more");
+            log_msg(1,
+                    "Weird error in verify_afioballs_on_CD() but it's really a cosmetic error, nothing more");
         } else {
             retval++;
-            log_to_screen("Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1);
+            sprintf(tmp, "Warning - missing set(s) between %d and %d\n",
+                    g_last_afioball_number, set_number - 1);
+            log_to_screen(tmp);
         }
     }
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(tmp, "Verifying %s #%d's tarballs", mds, g_current_media_number);
+    sprintf(tmp, "Verifying %s #%d's tarballs", mds, g_current_media_number);
     mr_free(mds);
 
     open_evalcall_form(tmp);
-    mr_free(tmp);
 
     for (total_sets = set_number;
@@ -192 +208 @@
     g_last_afioball_number = set_number - 1;
     close_evalcall_form();
+    paranoid_free(tmp);
     return (retval);
 }
@@ -210 +227 @@
 
     /*@ buffer ********************************************************** */
-    char *tmp = NULL;
-    char *mountpoint = NULL;
-    char *command = NULL;
+    char *tmp;
+    char *mountpoint;
+//  char ca, cb;
+    char *command;
     char *mds = NULL;
-    char *sz_exe = NULL;
+    char *sz_exe;
     static char *bufblkA = NULL;
     static char *bufblkB = NULL;
@@ -234 +252 @@
     FILE *fin;
     int retval = 0;
-
+//  long long outlen;
+
+    malloc_string(tmp);
+    malloc_string(mountpoint);
+    malloc_string(command);
+    malloc_string(sz_exe);
     if (!bufblkA) {
         if (!(bufblkA = malloc(maxbufsize))) {
@@ -251 +274 @@
     if (bkpinfo->compression_level > 0) {
         if (bkpinfo->use_lzo) {
-            mr_asprintf(sz_exe, "lzop");
+            strcpy(sz_exe, "lzop");
         } else if (bkpinfo->use_gzip) {
-            mr_asprintf(sz_exe, "gzip");
-        } else if (bkpinfo->use_lzma) {
-            mr_asprintf(sz_exe, "lzma");
+            strcpy(sz_exe, "gzip");
         } else {
-            mr_asprintf(sz_exe, "bzip2");
-        }
+            strcpy(sz_exe, "bzip2");
+        }
+    } else {
+        sz_exe[0] = '\0';
     }
 
     log_it("before vsbf");
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(tmp, "Verifying %s#%d's big files", mds, g_current_media_number);
+    sprintf(tmp, "Verifying %s#%d's big files", mds, g_current_media_number);
     mr_free(mds);
 
     open_evalcall_form(tmp);
-    mr_free(tmp);
-
     log_it("after vsbf");
-    mr_asprintf(mountpoint, "%s/archives", mtpt);
+    sprintf(mountpoint, "%s/archives", mtpt);
     if (last_bigfile_num == -1) {
         bigfile_num = 0;
@@ -281 +302 @@
         slice_num = last_slice_num + 1;
     }
-    while (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
+    while (does_file_exist
+           (slice_fname
+            (bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
            ||
-           does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+           does_file_exist(slice_fname
+                           (bigfile_num, slice_num, mountpoint, ""))) {
         // 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"))) {
+            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");
             } else {
-                if (fread ((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) < sizeof(biggiestruct)) {
+                if (fread
+                    ((void *) &biggiestruct, 1, sizeof(biggiestruct),
+                     fin) < sizeof(biggiestruct)) {
                     log_msg(2, "Unable to get biggiestruct");
                 }
                 paranoid_fclose(fin);
             }
-            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);
-    
-                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);
-                    paranoid_system(tmp);
-                    mr_free(tmp);
-
-                    bigfile_num++;
-                    slice_num = 0;
-                    retval++;
-                } else {
-                    slice_num++;
-                }
+            sprintf(tmp, "%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, "Failed to open bigfile. Darn.");
+                log_to_screen("%s/%s not found on live filesystem",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                mr_asprintf(mds, "echo \"%s/%s not found\" >> %s/biggies.changed",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename,
+                            bkpinfo->tmpdir);
+                paranoid_system(mds);
+                paranoid_free(mds);
+
+                bigfile_num++;
+                slice_num = 0;
+                retval++;
             } else {
-                log_it("Unable to open bigfile as restore_path is NULL");
+                slice_num++;
             }
         } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
@@ -325 +354 @@
             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, ""))) && (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);
+            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, ""))) {
+                sprintf(command, "%s -dc %s 2>> %s",
+                        sz_exe,
+                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
+                        MONDO_LOGFILE);
             } else {
-                mr_asprintf(command, "cat %s 2>> %s", slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
+                sprintf(command, "cat %s 2>> %s",
+                        slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
             }
-            pin = popen(command, "r");
-            mr_free(command);
-            if (pin) {
+            if ((pin = popen(command, "r"))) {
                 res = 0;
                 while (!feof(pin)) {
@@ -372 +404 @@
         }
     }
-    mr_free(mountpoint);
-    mr_free(sz_exe);
-
     last_bigfile_num = bigfile_num;
     last_slice_num = slice_num - 1;
@@ -387 +416 @@
         paranoid_free(bufblkB);
     }
+    paranoid_free(tmp);
+    paranoid_free(command);
+    paranoid_free(sz_exe);
+    paranoid_free(mountpoint);
     return (0);
 }
@@ -409 +442 @@
 {
     /*@ buffers ********************************************************* */
-    char *command = NULL;
-    char *outlog = NULL;
-    char *tmp = NULL;
-    char *p = NULL;
+    char *command;
+    char *outlog;
+    char *tmp;
+    char *p;
 
     /*@ pointers ******************************************************* */
@@ -429 +462 @@
 
     log_it("Verifying fileset '%s'", tarball_fname);
-    mr_asprintf(outlog, "%s/afio.log", bkpinfo->tmpdir);
-    /* if programmer forgot to say which compression thingy to use then find out */
-    if (strstr(tarball_fname, ".lzo") && strcmp(bkpinfo->zip_suffix, "lzo")) {
+    /*  chdir("/"); */
+    sprintf(outlog, "%s/afio.log", bkpinfo->tmpdir);
+/* if programmer forgot to say which compression thingy to use then find out */
+    if (strstr(tarball_fname, ".lzo")
+        && strcmp(bkpinfo->zip_suffix, "lzo")) {
         log_msg(2, "OK, I'm going to start using lzop.");
         strcpy(bkpinfo->zip_exe, "lzop");
@@ -437 +472 @@
         bkpinfo->use_lzo = TRUE;
         bkpinfo->use_gzip = FALSE;
-        bkpinfo->use_lzma = FALSE;
-    }
-    if (strstr(tarball_fname, ".gz") && strcmp(bkpinfo->zip_suffix, "gz")) {
+    }
+    if (strstr(tarball_fname, ".gz")
+        && strcmp(bkpinfo->zip_suffix, "gz")) {
         log_msg(2, "OK, I'm going to start using gzip.");
         strcpy(bkpinfo->zip_exe, "gzip");
@@ -445 +480 @@
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = TRUE;
-        bkpinfo->use_lzma = FALSE;
-    }
-    if (strstr(tarball_fname, ".bz2") && strcmp(bkpinfo->zip_suffix, "bz2")) {
+    }
+    if (strstr(tarball_fname, ".bz2")
+        && strcmp(bkpinfo->zip_suffix, "bz2")) {
         log_msg(2, "OK, I'm going to start using bzip2.");
         strcpy(bkpinfo->zip_exe, "bzip2");
@@ -453 +488 @@
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = FALSE;
-        bkpinfo->use_lzma = FALSE;
-    }
-    if (strstr(tarball_fname, ".lzma") && strcmp(bkpinfo->zip_suffix, "lzma")) {
-        log_msg(2, "OK, I'm going to start using lzma.");
-        strcpy(bkpinfo->zip_exe, "lzma");
-        strcpy(bkpinfo->zip_suffix, "lzma");
-        bkpinfo->use_lzo = FALSE;
-        bkpinfo->use_gzip = FALSE;
-        bkpinfo->use_lzma = TRUE;
-    }
-    if (bkpinfo->zip_exe == NULL) {
-        strcpy(bkpinfo->zip_exe, "none");
-    }
-    if (bkpinfo->zip_suffix == NULL) {
-        strcpy(bkpinfo->zip_suffix, "");
     }
     unlink(outlog);
@@ -473 +493 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            mr_asprintf(command, "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog, outlog);
+            sprintf(command,
+                    "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
+                    tarball_fname,
+                    (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,
+                    outlog);
     } else {
         bkpinfo->use_star = FALSE;
-        /* Here we suppose that there is always a compression program called */
-        if (bkpinfo->zip_exe) {
-            mr_asprintf(command, "afio -r -P %s -Z %s >> %s 2>> %s", bkpinfo->zip_exe, tarball_fname, outlog, outlog);
-        } else {
-            mr_asprintf(command, "afio -r -Z %s >> %s 2>> %s", tarball_fname, outlog, outlog);
-        }
+        sprintf(command, "afio -r -P %s -Z %s >> %s 2>> %s",
+                bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
     log_msg(6, "command=%s", command);
     paranoid_system(command);
-    mr_free(command);
-
     if (length_of_file(outlog) < 10) {
-        mr_asprintf(command, "cat %s >> %s", outlog, MONDO_LOGFILE);
+        sprintf(command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        mr_asprintf(command, "cut -d: -f%d %s | sort -u", (bkpinfo->use_star) ? 1 : 2, outlog);
+        sprintf(command, "cut -d: -f%d %s | sort -u",
+                (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
-            for (mr_getline(tmp, pin); !feof(pin); mr_getline(tmp, pin)) {
+            for (p = fgets(tmp, MAX_STR_LEN, pin); !feof(pin) && (p != NULL);
+                 p = fgets(tmp, MAX_STR_LEN, pin)) {
                 if (bkpinfo->use_star) {
                     if (!strstr(tmp, "diffopts=")) {
-                        while (strlen(tmp) > 0 && tmp[strlen(tmp) - 1] < 32) {
+                        while (strlen(tmp) > 0
+                               && tmp[strlen(tmp) - 1] < 32) {
                             tmp[strlen(tmp) - 1] = '\0';
                         }
                         if (strchr(tmp, '/')) {
                             if (!diffs) {
-                                log_msg(0, "'%s' - differences found", tarball_fname);
+                                log_msg(0, "'%s' - differences found",
+                                        tarball_fname);
                             }
-                            log_msg(0, "star: /%s", strip_afio_output_line(tmp));
+                            log_msg(0, "star: /%s",
+                                    strip_afio_output_line(tmp));
                             diffs++;
                         }
@@ -509 +532 @@
                 } else {
                     if (!diffs) {
-                        log_msg(0, "'%s' - differences found", tarball_fname);
+                        log_msg(0, "'%s' - differences found",
+                                tarball_fname);
                     }
                     log_msg(0, "afio: /%s", strip_afio_output_line(tmp));
                     diffs++;
                 }
-                mr_free(tmp);
             }
-            mr_free(tmp);
             paranoid_pclose(pin);
         } else {
@@ -522 +544 @@
         }
     }
-    mr_free(command);
-    mr_free(outlog);
+    /*  chdir(old_pwd); */
+    //  sprintf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
+    //  paranoid_system (tmp);
+    //  unlink ("/tmp/mondo-verify.err");
+    paranoid_free(command);
+    paranoid_free(outlog);
+    paranoid_free(tmp);
     return (0);
 }
@@ -577 +604 @@
 
     /*@ buffers ********************************************************** */
-    char *tmp = NULL;
-    char *tarball_fname = NULL;
+    char *tmp;
+    char *tarball_fname;
 
     /*@ pointers ********************************************************* */
     char *p;
 
+    malloc_string(tmp);
+    malloc_string(tarball_fname);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(orig_fname);
@@ -592 +621 @@
         p++;
     }
-    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(tmp, "Temporarily copying file from tape to '%s'",
+            tarball_fname);
+/*  log_it(tmp); */
     read_file_from_stream_to_file(tarball_fname, size);
     res = verify_a_tarball(tarball_fname);
     if (res) {
-        log_msg(0, "Afioball '%s' no longer matches your live filesystem", p);
+        sprintf(tmp,
+                "Afioball '%s' no longer matches your live filesystem", p);
+        log_msg(0, tmp);
         retval++;
     }
     unlink(tarball_fname);
-    mr_free(tarball_fname);
+    paranoid_free(tmp);
+    paranoid_free(tarball_fname);
     return (retval);
 }
@@ -627 +660 @@
 
     /*@ char ************************************************************ */
-    char *test_file = NULL;
-    char *biggie_cksum = NULL;
-    char *orig_cksum = NULL;
-    char *tmp = NULL;
-    char *slice_fnam = NULL;
+    char *test_file;
+    char *biggie_cksum;
+    char *orig_cksum;
+    char *tmp;
+    char *slice_fnam;
 
     /*@ pointers ******************************************************** */
@@ -639 +672 @@
     long long slice_siz;
 
+    malloc_string(test_file);
+    malloc_string(biggie_cksum);
+    malloc_string(orig_cksum);
+    malloc_string(tmp);
     malloc_string(slice_fnam);
     assert(bkpinfo != NULL);
@@ -649 +686 @@
         p++;
     }
-    mr_asprintf(test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(tmp,
+            "Temporarily copying biggiefile %s's slices from tape to '%s'",
+            p, test_file);
+/*  log_it(tmp); */
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
          ctrl_chr != BLK_STOP_A_BIGGIE;
          res =
-         read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr)) {
+         read_header_block_from_stream(&slice_siz, slice_fnam,
+                                       &ctrl_chr)) {
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
@@ -661 +703 @@
         unlink(test_file);
         res =
-            read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
+            read_header_block_from_stream(&slice_siz, slice_fnam,
+                                          &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             log_msg(2, "test_file = %s", test_file);
@@ -669 +712 @@
         retval += res;
     }
-    mr_asprintf(biggie_cksum, "%s", slice_fnam);
+    strcpy(biggie_cksum, slice_fnam);
     if (biggie_cksum[0] != '\0') {
-        mr_asprintf(orig_cksum, "%s", calc_checksum_of_file(biggie_fname));
+        strcpy(orig_cksum, calc_checksum_of_file(biggie_fname));
         if (strcmp(biggie_cksum, orig_cksum)) {
-            log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
-            log_to_screen("%s has changed on live filesystem", biggie_fname);
-
-            mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
+            sprintf(tmp, "orig cksum=%s; curr cksum=%s", biggie_cksum,
+                    orig_cksum);
+            log_msg(2, tmp);
+            sprintf(tmp, "%s has changed on live filesystem",
+                    biggie_fname);
+            log_to_screen(tmp);
+            sprintf(tmp, "echo \"%s\" >> %s/biggies.changed",
+                    biggie_fname, bkpinfo->tmpdir);
             paranoid_system(tmp);
-            mr_free(tmp);
-        }
-        mr_free(orig_cksum);
-    }
-    mr_free(biggie_cksum);
-    mr_free(test_file);
+        }
+    }
+    paranoid_free(test_file);
+    paranoid_free(biggie_cksum);
+    paranoid_free(orig_cksum);
+    paranoid_free(tmp);
     paranoid_free(slice_fnam);
     return (retval);
@@ -692 +739 @@
  * Verify all afioballs from the opened tape/CD stream.
  * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->restore_path
  * - @c bkpinfo->tmpdir
  *
@@ -706 +754 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
+    char *tmp;
     char *fname;
     char *curr_xattr_list_fname;
@@ -715 +763 @@
 
     assert(bkpinfo != NULL);
+    malloc_string(tmp);
     malloc_string(fname);
     malloc_string(curr_xattr_list_fname);
@@ -767 +816 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        mr_asprintf(tmp, "Verifying fileset #%ld", current_afioball_number);
+        sprintf(tmp, "Verifying fileset #%ld", current_afioball_number);
+        /*log_it(tmp); */
         update_progress_form(tmp);
-        mr_free(tmp);
-
         res = verify_an_afioball_from_stream(fname, size);
         if (res) {
-            log_to_screen("Afioball %ld differs from live filesystem", current_afioball_number);
+            sprintf(tmp, "Afioball %ld differs from live filesystem",
+                    current_afioball_number);
+            log_to_screen(tmp);
         }
         retval += res;
@@ -785 +835 @@
     log_msg(1, "All done with afioballs");
     close_progress_form();
+    paranoid_free(tmp);
     paranoid_free(fname);
     paranoid_free(curr_xattr_list_fname);
@@ -812 +863 @@
 
     /*@ buffers ******************************************************** */
-    char *orig_fname;
-    char *logical_fname = NULL;
-    char *comment = NULL;
-    char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname = NULL;
+    char *tmp;
+    char *orig_fname, *logical_fname;
+    char *comment;
+    char *curr_xattr_list_fname;
+    char *curr_acl_list_fname;
     /*@ pointers ******************************************************* */
     char *p;
@@ -824 +875 @@
 
     assert(bkpinfo != NULL);
+    malloc_string(tmp);
     malloc_string(orig_fname);
+    malloc_string(logical_fname);
+    malloc_string(comment);
     malloc_string(curr_xattr_list_fname);
     malloc_string(curr_acl_list_fname);
@@ -836 +890 @@
             bkpinfo->tmpdir);
     }
-    mr_asprintf(comment, "Verifying all bigfiles.");
+    sprintf(comment, "Verifying all bigfiles.");
     log_to_screen(comment);
+    sprintf(tmp, "%s/biggielist.txt", bkpinfo->tmpdir);
+//  noof_biggiefiles = count_lines_in_file (tmp); // pointless
     res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
@@ -855 +911 @@
                        "Please wait. This may take some time.", "",
                        noof_biggiefiles);
-    mr_free(comment);
-
     for (res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
          ctrl_chr != BLK_STOP_BIGGIEFILES;
@@ -871 +925 @@
             p++;
         }
-        mr_asprintf(comment, "Verifying bigfile #%ld (%ld K)", current_biggiefile_number, (long) size >> 10);
+        sprintf(comment, "Verifying bigfile #%ld (%ld K)",
+                current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
-        mr_free(comment);
-
-        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");
-        }
-
+        sprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
+        res =
+            verify_a_biggiefile_from_stream(logical_fname, size);
+        retval += res;
         current_biggiefile_number++;
         g_current_progress++;
@@ -889 +937 @@
     close_progress_form();
     paranoid_free(orig_fname);
+    paranoid_free(logical_fname);
     paranoid_free(curr_xattr_list_fname);
     paranoid_free(curr_acl_list_fname);
+    paranoid_free(comment);
+    paranoid_free(tmp);
     return (retval);
 }
@@ -900 +951 @@
  * Verify the USB device
  * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->isodir
  * - @c bkpinfo->media_device
  * - @c bkpinfo->tmpdir
@@ -929 +981 @@
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
-
     mr_asprintf(fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
@@ -984 +1032 @@
 #endif
     {
-        log_to_screen("%s failed; unable to unmount USB device\n", tmp1);
+        mr_asprintf(tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
         retval++;
     } else {
         log_msg(2, "OK, I've unmounted the USB device\n");
     }
-    mr_free(tmp1);
-    mr_free(mountpoint);
+    paranoid_free(tmp1);
+    paranoid_free(mountpoint);
     return (retval);
 }
@@ -1016 +1066 @@
 
     /*@ buffers ******************************************************** */
-    char *mountpoint = NULL;
-    char *command = NULL;
-    char *tmp = NULL;
-    char *fname = NULL;
+    char *mountpoint;
+    char *command;
+    char *tmp;
+    char *fname;
 #ifdef __FreeBSD__
     char mdd[32];
@@ -1029 +1079 @@
 #endif
 
+    command = malloc(2000);
+    malloc_string(mountpoint);
+    malloc_string(tmp);
+    malloc_string(fname);
+
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
-
-    mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
-        fatal_error("No iso filename preparation possible");
-    }
-    if (bkpinfo->netfs_remote_dir) {
-        // NETFS
-        mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
-    } else {
-        // ISO
-        mr_asprintf(fname, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
-    }
+    sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
+    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir,
+            bkpinfo->prefix, g_current_media_number);
 
     mkdir(mountpoint, 1777);
     sync();
     if (!does_file_exist(fname)) {
-        log_msg(2, "%s not found; assuming you backed up to CD; verifying CD...", fname);
+        sprintf(tmp,
+                "%s not found; assuming you backed up to CD; verifying CD...",
+                fname);
+        log_msg(2, tmp);
         if (bkpinfo->manual_cd_tray) {
             popup_and_OK("Please push CD tray closed.");
@@ -1056 +1102 @@
         if (find_and_mount_actual_cd(mountpoint)) {
             log_to_screen("failed to mount actual CD");
-            mr_free(mountpoint);
-            mr_free(fname);
             return (1);
         }
     } else {
-        log_msg(2, "%s found; verifying ISO...", fname);
+        sprintf(tmp, "%s found; verifying ISO...", fname);
 #ifdef __FreeBSD__
         ret = 0;
@@ -1067 +1111 @@
         mddevice = make_vn(fname);
         if (ret) {
-            log_to_screen("make_vn of %s failed; unable to verify ISO\n", fname);
-            mr_free(mountpoint);
-            mr_free(fname);
+            sprintf(tmp, "make_vn of %s failed; unable to verify ISO\n",
+                    fname);
+            log_to_screen(tmp);
             return (1);
         }
-        mr_asprintf(command, "mount_cd9660 %s %s", mddevice, mountpoint);
+        sprintf(command, "mount_cd9660 %s %s", mddevice, mountpoint);
 #else
-        mr_asprintf(command, "mount -o loop,ro -t iso9660 %s %s", fname, mountpoint);
+        sprintf(command, "mount -o loop,ro -t iso9660 %s %s", fname,
+                mountpoint);
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            log_to_screen("%s failed; unable to mount ISO image\n", command);
-            mr_free(mountpoint);
-            mr_free(command);
-            mr_free(fname);
+            sprintf(tmp, "%s failed; unable to mount ISO image\n",
+                    command);
+            log_to_screen(tmp);
             return (1);
         }
-        mr_free(command);
     }
     log_msg(2, "OK, I've mounted the ISO/CD\n");
-    mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    sprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -1098 +1141 @@
 */
     }
-    mr_free(tmp);
-
     verify_afioballs_on_CD(mountpoint);
     log_it("before verify_all_slices");
@@ -1106 +1147 @@
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(command, "umount -d %s", mountpoint);
+    sprintf(command, "umount -d %s", mountpoint);
     ret += system(command);
     ret += kick_vn(mddevice);
-    if (ret) {
+    if (ret)
 #else
-    mr_asprintf(command, "umount -d %s", mountpoint);
-    if (system(command)) {
+    sprintf(command, "umount -d %s", mountpoint);
+    if (system(command))
 #endif
-        log_to_screen("%s failed; unable to unmount ISO image\n", command);
-
+    {
+        sprintf(tmp, "%s failed; unable to unmount ISO image\n", command);
+        log_to_screen(tmp);
         retval++;
     } else {
         log_msg(2, "OK, I've unmounted the ISO file\n");
     }
-    mr_free(mountpoint);
-    mr_free(command);
-
     if (!does_file_exist(fname)) {
-        mr_asprintf(command, "umount -d %s", bkpinfo->media_device);
+        sprintf(command, "umount -d %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
-        mr_free(command);
-
-        if (!bkpinfo->please_dont_eject && eject_device(bkpinfo->media_device)) {
+        if (!bkpinfo->please_dont_eject
+            && eject_device(bkpinfo->media_device)) {
             log_msg(2, "Failed to eject CD-ROM drive");
         }
     }
-    mr_free(fname);
+    paranoid_free(command);
+    paranoid_free(mountpoint);
+    paranoid_free(tmp);
+    paranoid_free(fname);
     return (retval);
 }
@@ -1150 +1191 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp = NULL;
-    char *changed_files_fname = NULL;
+    char tmp[MAX_STR_LEN];
+    char changed_files_fname[MAX_STR_LEN];
 
     /*@ long *********************************************************** */
@@ -1165 +1206 @@
     retval += verify_biggiefiles_from_stream();
 /* find the final blocks */
-    sync();
+    paranoid_system("sync");
     sleep(2);
     closein_tape();
 /* close tape; exit */
 //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
-    mr_asprintf(tmp, "rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    sprintf(tmp, "rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
-    mr_asprintf(tmp, "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s", (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, changed_files_fname);
+    sprintf(changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
+    sprintf(tmp,
+            "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s",
+            (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, 
+            changed_files_fname);
     log_msg(2, "Running command to derive list of changed files");
     log_msg(2, tmp);
     if (system(tmp)) {
-        if (does_file_exist(changed_files_fname) && length_of_file(changed_files_fname) > 2) {
-            log_to_screen("Warning - unable to check logfile to derive list of changed files");
+        if (does_file_exist(changed_files_fname)
+            && length_of_file(changed_files_fname) > 2) {
+            log_to_screen
+                ("Warning - unable to check logfile to derive list of changed files");
         } else {
-            log_to_screen("No differences found. Therefore, no 'changed.files' text file.");
-        }
-    }
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
+            log_to_screen
+                ("No differences found. Therefore, no 'changed.files' text file.");
+        }
+    }
+    sprintf(tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
     paranoid_system(tmp);
-    mr_free(tmp);
 
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        mr_asprintf(tmp, "cp -f %s %s/changed.files", changed_files_fname, MONDO_CACHE);
+        sprintf(tmp, "cp -f %s %s/changed.files", changed_files_fname,
+                MONDO_CACHE);
         run_program_and_log_output(tmp, FALSE);
-        mr_free(tmp);
-
-        log_msg(0, "%ld files differed from live filesystem; type less %s or less %s/changed.files to see", diffs, changed_files_fname, MONDO_CACHE);
+        sprintf(tmp,
+                "%ld files differed from live filesystem; type less %s or less %s/changed.files to see",
+                diffs, changed_files_fname, MONDO_CACHE);
+        log_msg(0, tmp);
         log_to_screen("See "MONDO_CACHE"/changed.files for a list of nonmatching files.");
         log_to_screen("The files probably changed on filesystem, not on backup media.");
-    }
-    mr_free(changed_files_fname);
+        //      retval++;
+    }
     return (retval);
 }