Changeset 3190 in MondoRescue for branches/3.1

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

Location:

branches/3.1/mondo/src/common

Files:

• libmondo-archive.c (modified) (30 diffs)
• libmondo-cli.c (modified) (16 diffs)
• libmondo-devices-EXT.h (modified) (1 diff)
• libmondo-devices.c (modified) (17 diffs)
• libmondo-devices.h (modified) (1 diff)
• libmondo-filelist.c (modified) (14 diffs)
• libmondo-files.c (modified) (16 diffs)
• libmondo-fork.c (modified) (10 diffs)
• libmondo-mountlist.c (modified) (2 diffs)
• libmondo-raid.c (modified) (1 diff)
• libmondo-stream.c (modified) (11 diffs)
• libmondo-string.c (modified) (7 diffs)
• libmondo-tools-EXT.h (modified) (1 diff)
• libmondo-tools.c (modified) (19 diffs)
• libmondo-tools.h (modified) (1 diff)
• libmondo-verify.c (modified) (3 diffs)
• mondostructures.h (modified) (2 diffs)
• newt-specific.c (modified) (14 diffs)

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

@@ -503 +503 @@
     /*@ buffer ************************************************************ */
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *tmp2 = NULL;
     char *command = NULL;
@@ -513 +514 @@
     char *bootldr_ver = NULL;
     char *tape_device = NULL;
+    char *last_filelist_number = NULL;
     char *broken_bios_sz = NULL;
     char *cd_recovery_sz = NULL;
@@ -535 +537 @@
     assert(bkpinfo != NULL);
 
+    mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
+    open_evalcall_form("Calling MINDI to create boot+data disks");
     mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
@@ -547 +551 @@
     mr_free(tmp);
 
+    mr_asprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
+    mr_asprintf(last_filelist_number, "%s", last_line_of_file(tmp));
+    mr_free(tmp);
+
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        mr_asprintf(tape_size_sz, "%ld", bkpinfo->media_size);
         if (bkpinfo->media_device) {
             ntapedev = get_non_rewind_dev(bkpinfo->media_device);
@@ -721 +729 @@
     }
     log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+
     if (bootldr_ver != NULL) {
-        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
-        log_to_screen(tmp);
-        mr_free(tmp);
-    }
-    if (bootldr_ver != NULL) {
-        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Boot loader version string: %s", bootldr_ver);
     }
 
@@ -776 +778 @@
     }
 
+    mr_asprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
+    if (write_one_liner_data_file(tmp, value)) {
+        res++;
+        log_msg(1, "%ld: Unable to write one-liner backup-media-type", __LINE__);
+    }
+    mr_free(value);
+    mr_free(tmp);
+
     mr_asprintf(tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bootldr_str)) {
@@ -784 +794 @@
     mr_free(tmp);
 
+    mr_asprintf(tmp, "%s/BOOTLOADER.VER", bkpinfo->tmpdir);
+    if (write_one_liner_data_file(tmp, bootldr_ver)) {
+        res++;
+        log_msg(1, "%ld: Unable to write one-liner bootloader.ver",
+                __LINE__);
+    }
+    mr_free(bootldr_ver);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
+    if (bkpinfo->differential) {
+        res += write_one_liner_data_file(tmp, "1");
+    } else {
+        res += write_one_liner_data_file(tmp, "0");
+    }
+    mr_free(tmp);
+
+    if (g_getfattr) {
+        mr_asprintf(tmp1, "%s/XATTR", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner XATTR",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
+    if (g_getfacl) {
+        mr_asprintf(tmp1, "%s/ACL", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner ACL",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
+    if (bkpinfo->use_obdr) {
+        mr_asprintf(tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner OBDR",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
+
     estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
 
-    /* BERLIOS: add netfs stuff here? */
+    /* TODO: add netfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -796 +848 @@
     update_evalcall_form(3);
 
-    /*                          1           2  3          4    5    6    7   8    9    10 */
-    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' %ld '%s' '%s' '%s' \
-'%s' %ld '%s' '%s' '%s' '%s' %ld %d '%s' '%s' '%s' >> %s", 
-/* 11 12  13   14   15   16  17  18  19   20   21     last */
-            tmp2,               // parameter #1
-            bkpinfo->tmpdir,    // parameter #2
+/*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
+6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
+11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
+    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' \
+'%s' %ld '%s' '%s' '%s' \
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
             bkpinfo->scratchdir,    // parameter #3
             bkpinfo->kernel_path,   // parameter #4
@@ -811 +863 @@
             (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
             broken_bios_sz,     // parameter #11
-            estimated_total_noof_slices,    // parameter #12 (INT)
-            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #13
-            use_comp_sz,        // parameter #14
-            use_lilo_sz,        // parameter #15
-            use_star_sz,        // parameter #16
-            bkpinfo->internal_tape_block_size,  // parameter #17 (LONG)
-            bkpinfo->differential,  // parameter #18 (INT)
+            last_filelist_number,   // parameter #12 (STRING)
+            estimated_total_noof_slices,    // parameter #13 (INT)
+            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #14
+            use_comp_sz,        // parameter #15
+            use_lilo_sz,        // parameter #16
+            use_star_sz,        // parameter #17
+            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
+            bkpinfo->differential,  // parameter #19 (INT)
             use_gzip_sz,        // parameter #19 (STRING)
             use_lzma_sz,        // parameter #20 (STRING)
@@ -823 +876 @@
             MONDO_LOGFILE);
 
-    mr_free(value);
-    mr_free(tmp2);
+    mr_free(last_filelist_number);
     mr_free(tape_device);
     mr_free(use_lzo_sz);
@@ -844 +896 @@
 //  popup_and_OK("Pausing");
 
-    mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
-    open_evalcall_form("Calling MINDI to create boot+data disks");
     res = run_external_binary_with_percentage_indicator_NEW("Generating boot+data disks", command);
     update_evalcall_form(99);
@@ -872 +922 @@
             run_program_and_log_output(command, FALSE);
             mr_free(command);
+        } else {
+            mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
+            if (system(tmp)) {
+                fatal_error("Cannot find all.tar.gz in tmpdir");
+            }
+            mr_free(tmp);
         }
         if (res) {
@@ -982 +1038 @@
         mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
-            log_msg(3, "[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.", getpid(), this_thread_no, archiving_set_no);
+            log_msg(3, "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
             mr_free(archiving_afioball_fname);
             break;
@@ -989 +1045 @@
         mr_asprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "[%d:%d] - waiting for storer", getpid(), this_thread_no);
+            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES, getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -997 +1053 @@
         mr_free(tmp);
 
-        log_msg(4, "[%d:%d] - EXATing %d...", getpid(), this_thread_no, archiving_set_no);
+        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
 
         if (g_getfattr) {
@@ -1010 +1066 @@
         }
 
-        log_msg(4, "[%d:%d] - archiving %d...", getpid(), this_thread_no, archiving_set_no);
+        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
         res = archive_this_fileset(archiving_filelist_fname, archiving_afioball_fname, archiving_set_no);
         mr_free(archiving_afioball_fname);
@@ -1035 +1091 @@
             fatal_error("Cannot get semaphore V");
         }
-        log_msg(4, "[%d:%d] - archived %d OK", getpid(), this_thread_no, archiving_set_no);
+        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
         archiving_set_no++;
 
@@ -1050 +1106 @@
         fatal_error("Cannot get semaphore V");
     }
-    log_msg(3, "[%d:%d] - exiting", getpid(), this_thread_no);
+    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(), this_thread_no);
     pthread_exit(NULL);
 }
@@ -1338 +1394 @@
             if (!get_bit_N_of_array
                 (p_list_of_fileset_flags, storing_set_no)) {
-                misc_counter_that_is_not_important = (misc_counter_that_is_not_important + 1) % 5;
-                sleep(1);
+            misc_counter_that_is_not_important = (misc_counter_that_is_not_important + 1) % 5;
+            /* BCO the media_usage_comment is not really initialized there !
+            if (!misc_counter_that_is_not_important) {
+                update_progress_form(media_usage_comment);
+            }
+            */
+            sleep(1);
             } else {
                 // store set N
@@ -1765 +1826 @@
                 log_msg(1, "Non-ia64 --> lilo");
                 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
-                    // FIXME: fixed boot size probably wrong. lilo to be removed
+                // FIXME: fixed boot size probably wrong. lilo to be removed
                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
+                mr_free(full_isofs_cmd);
 #endif
             } else {
@@ -1773 +1835 @@
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
-            }
-            mr_free(full_isofs_cmd);
+                mr_free(full_isofs_cmd);
+            }
         }
         mr_free(isofs_cmd);
@@ -2002 +2064 @@
             }
             retval += res;
+            p = strrchr(bigfile_fname, '/');
+            if (p) {
+                p++;
+            } else {
+                p = bigfile_fname;
+            }
             mr_asprintf(tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
@@ -2239 +2307 @@
     }
 
+    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir, biggielist);
+    paranoid_system(command);
+    mr_free(command);
+
     mr_asprintf(blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
@@ -2351 +2423 @@
     va_end(ap);
 
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         fatal_error("move_files_to_cd() - unknown media size");
     }
-    if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
+    if (would_occupy / 1024 > bkpinfo->media_size) {
         res = write_iso_and_go_on(FALSE);   /* FALSE because this is not the last CD we'll write */
         retval += res;
@@ -2707 +2779 @@
     char *checksum_line = NULL;
     char *command = NULL;
-    char *tempblock;
+    char *tempblock = NULL;
     char *curr_slice_fname_uncompressed = NULL;
     char *curr_slice_fname_compressed = NULL;
@@ -2834 +2906 @@
     }
     i = bkpinfo->optimal_set_size / 256;
+    if (!(tempblock = (char *) malloc(256 * 1024))) {
+        fatal_error("malloc error 256*1024");
+    }
     for (slice_num = 1; !finished; slice_num++) {
         mr_asprintf(curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
@@ -2849 +2924 @@
         }
         if ((i == bkpinfo->optimal_set_size / 256) && (totalread < 1.1 * totallength)) {
-            tempblock = mr_malloc(256 * 1024);
             for (i = 0L; i < bkpinfo->optimal_set_size / 256; i++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
@@ -3071 +3145 @@
     assert(bkpinfo != NULL);
     orig_vfy_flag_val = bkpinfo->verify_data;
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         fatal_error("write_iso_and_go_on() - unknown media size");
     }
@@ -3108 +3182 @@
     mr_free(lastcd_fname);
 
-    if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 >
-        bkpinfo->media_size[g_current_media_number]) {
-        log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir), (long) bkpinfo->media_size[g_current_media_number]);
+    if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
+        log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",(long) space_occupied_by_cd(bkpinfo->scratchdir),(long) bkpinfo->media_size);
     }
     if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
@@ -3181 +3254 @@
 
     g_current_media_number++;
-    if (g_current_media_number > MAX_NOOF_MEDIA) {
-        fatal_error("Too many media. Use tape or net.");
-    }
     wipe_archives(bkpinfo->scratchdir);
     mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);

branches/3.1/mondo/src/common/libmondo-cli.c

@@ -39 +39 @@
 
 extern void setup_tmpdir(char *path);
+extern void setup_scratchdir(char *path);
 void mr_make_devlist_from_pathlist(char *pathlist, char mode);
 extern double g_kernel_version;
@@ -85 +86 @@
         flag_set[i] = FALSE;
     }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = 650;
-    }                           /* default */
+    bkpinfo->media_size = 650; /* default */
     res = retrieve_switches_from_command_line(argc, argv, flag_val, flag_set);
     retval += res;
@@ -94 +93 @@
         retval += res;
     }
+
     log_msg(3, "Switches:-");
     for (i = 0; i < 128; i++) {
@@ -100 +100 @@
         }
     }
-    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    /*  Before erasing dirs go into a safe place */
-    if (chdir("/tmp")) {
-        // FIXME
-    }
-    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
+
     return (retval);
 }
-
-
 
 
@@ -130 +114 @@
 int process_the_s_switch(char *value)
 {
-    int j;
-    char tmp[MAX_STR_LEN], *p; 
-
     assert(bkpinfo != NULL);
     assert(value != NULL);
 
-    bkpinfo->media_size[0] = -1;    /* dummy value */
-    for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
-         j++, p = strchr(p, ',') + 1) {
-        strncpy(tmp, p, MAX_STR_LEN);
-        *(strchr(tmp, ',')) = '\0';
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        log_msg(3, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
-    }
-    for (; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
-    }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        if (bkpinfo->media_size[j] <= 0) {
-            log_msg(1, "You gave media #%d an invalid size\n", j);
-            return (-1);
-        }
+    bkpinfo->media_size = -1;   /* dummy value */
+    bkpinfo->media_size = friendly_sizestr_to_sizelong(value);
+    log_msg(3, "media_size = %ld", bkpinfo->media_size);
+    if (bkpinfo->media_size <= 0) {
+        log_msg(1, "You gave media an invalid size %s\n", value);
+        return (-1);
     }
     return (0);
@@ -269 +240 @@
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
+        }
+        if (!strcmp(bkpinfo->include_paths, "/")) {
+            log_msg(2, "'/' is pleonastic.");
+            bkpinfo->include_paths[0] = '\0';
+        }
+        if (bkpinfo->include_paths[0]) {
+            strcat(bkpinfo->include_paths, "|");
         }
 
@@ -361 +339 @@
         mr_free(tmp1);
         flag_set['d'] = TRUE;
-        strcpy(flag_val['d'], p);
-        mr_free(p);
         log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
     }
@@ -429 +405 @@
                 }
             } else if (flag_set['u'] || flag_set['t']) {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 0;
-                }
+                bkpinfo->media_size = 0;
             } else {
                 retval++;
@@ -483 +457 @@
         /* p points on to the string server:/path */
         /* Store the 2 values */
+        /*  using memmove instead of strcpy as per #584 */
+        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
         bkpinfo->netfs_mount = p;
 
@@ -492 +468 @@
             p++;
             /* new netfs mount */
-            bkpinfo->netfs_mount = p;
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
+            /* now that user is computed, create the right value by removing end of string */
             p--;
             *p = '\0';
@@ -506 +483 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
-                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
                     mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
@@ -521 +496 @@
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
                     mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
-                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
@@ -611 +584 @@
 
     if (flag_set['E']) {
-        if (bkpinfo->exclude_paths && bkpinfo->exclude_paths[0] == '-') {
+        if (bkpinfo->exclude_paths && (bkpinfo->exclude_paths[0] == '-')) {
             retval++;
             log_to_screen("Please supply a sensible value with '-E'\n");
@@ -758 +731 @@
         if (i) {
             retval++;
-            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
+            log_to_screen("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
         }
         unlink(tmp1);
@@ -805 +778 @@
             mr_free(tmp1);
         }
-        mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
+
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp1, 1)) {
+            retval++;
+            mr_free(tmp1);
+            log_to_screen("Please don't specify a SAMBA or VFAT or NFS scratchdir.");
+            fatal_error("I cannot write to the scratchdir you specified.");
+        }
+        mr_free(tmp1);
     }
 
@@ -815 +796 @@
 
         if (i) {
+            retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");

branches/3.1/mondo/src/common/libmondo-devices-EXT.h

@@ -48 +48 @@
 extern char *list_of_NETFS_mounts_only(void);
 
-extern void sensibly_set_scratchdir();
-
-
 extern char *set_dev_to_this_if_rx_OK(char *);
 

branches/3.1/mondo/src/common/libmondo-devices.c

@@ -50 +50 @@
 extern char *g_selfmounted_isodir;
 extern char *MONDO_LOGFILE;
+
+extern void setup_tmpdir(char *path);
+extern void setup_scratchdir(char *path);
 
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -330 +333 @@
     char *incoming = NULL;
     char *searchstr = NULL;
+    char *tmp = NULL;
 
     /*@ ints ******************************************************* */
@@ -349 +353 @@
     res = system(program);
     mr_free(program);
-    return (res);
+    return(res);
 #endif
 
@@ -400 +404 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
+    /* For UEFI detection, this should be extended to count=2 */
     mr_asprintf(command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
     i = system(command);
@@ -845 +850 @@
     tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     log_msg(5, "tmp = '%s'", tmp);
-    if (!tmp[0])
+    if (!tmp[0]) {
         mr_free(tmp);
         tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
+    }
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
@@ -1433 +1439 @@
 
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == netfs) {
-        // BERLIOS --- I'm tempted to do something about this...
-        // Why unmount and remount again and again?
         g_ISO_restore_mode = TRUE;
-        if (!is_this_device_mounted(MNT_CDROM)) {
-            log_msg(3, "Mounting media");
-            g_current_media_number = cd_number_i_want;
-            mount_media();
-        }
     }
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
@@ -1733 +1732 @@
             log_msg (4, "Found partition: %s", token);
             partitions[i++] = token;
+            mr_free(token);
         }
         mr_asprintf(ndsf, "%s", dsf);
@@ -1939 +1939 @@
                 if ((DSFptr = find_device_in_list(token)) == NULL) {
                     log_msg (4, "Can't find device %s in mounted file systems list", token);
+                    mr_free(tmp);
                     mr_free(token);
                     return (1);
@@ -2734 +2735 @@
             sz_size = p;
 
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
-
-            if (bkpinfo->media_size[0] <= 0) {
+            bkpinfo->media_size = atoi(sz_size);
+
+            if (bkpinfo->media_size <= 0) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -2804 +2803 @@
 
         if (bkpinfo->backup_media_type == cdstream) {
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = 650;
-            }
+            bkpinfo->media_size = 650;
         }
         break;
@@ -2866 +2863 @@
             bkpinfo->media_size[0] = 0;
         }
-        for (i = 1; i <= MAX_NOOF_MEDIA; i++) {
-            bkpinfo->media_size[i] = bkpinfo->media_size[0];
-        }
+
+        bkpinfo->media_size = 0;
+        log_msg(4, "media_size = %ld", bkpinfo->media_size);
+
         bkpinfo->use_obdr = ask_me_yes_or_no
             ("Do you want to activate OBDR support for your tapes ?");
@@ -2960 +2958 @@
                 mr_asprintf(sz_size, "0");
             }
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
+            bkpinfo->media_size = atoi(sz_size);
             mr_free(sz_size);
-            if (bkpinfo->media_size[0] < 0) {
+
+            if (bkpinfo->media_size < 0) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -3172 +3169 @@
         }
         bkpinfo->boot_loader = i;
+
         mr_free(bkpinfo->include_paths);
         mr_asprintf(p, "/");
@@ -3237 +3235 @@
                 mr_asprintf(g_getfacl,"getfacl");
             }
+            log_it("Backup of extended attributes");
         }
 // Interactive mode:
@@ -3302 +3301 @@
 
     log_it("media device = %s", bkpinfo->media_device);
-    log_it("media size = %ld", bkpinfo->media_size[1]);
+    log_it("media size = %ld", bkpinfo->media_size);
     tmp = bkptype_to_string(bkpinfo->backup_media_type);
     log_it("media type = %s", tmp);
@@ -3316 +3315 @@
     /* Handle devices passed in bkpinfo and print result */
     /*  the mr_make_devlist_from_pathlist function appends
-    *  to the *_paths variables so copy before */
-    mr_asprintf(tmp, "%s|", bkpinfo->exclude_paths);
-    mr_make_devlist_from_pathlist(tmp, 'E');
-    mr_free(tmp);
-    mr_asprintf(tmp, "%s|", bkpinfo->include_paths);
-    mr_make_devlist_from_pathlist(tmp, 'I');
-    mr_free(tmp);
+    /*  to the *_paths variables so copy before */
+    mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
+    mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
 
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
@@ -3330 +3325 @@
     }
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
-    if (bkpinfo->media_size[0] < 0) {
+    if (bkpinfo->media_size < 0) {
         if (archiving_to_media) {
             fatal_error("Media size is less than zero.");
         } else {
             log_msg(2, "Warning - media size is less than zero.");
-            bkpinfo->media_size[0] = 0;
+            bkpinfo->media_size = 0;
         }
     }

branches/3.1/mondo/src/common/libmondo-devices.h

@@ -40 +40 @@
 char *list_of_NETFS_mounts_only();
 
-void sensibly_set_scratchdir();
-
-
 char *set_dev_to_this_if_rx_OK(char *dev);
 

branches/3.1/mondo/src/common/libmondo-filelist.c

@@ -29 +29 @@
 
 
+extern ssize_t getline(char **lineptr, size_t * n, FILE * stream);
 extern char *MONDO_LOGFILE;
 
@@ -451 +452 @@
         }
         log_msg(8, "Analyzing %s", file_to_analyze);
-        tmp = mr_stresc(file_to_analyze, " `$\\\"(){}[]'*?&|!#~", '\\');
-        mr_asprintf(strtmp, syscall_sprintf, tmp);
+        tmp = mr_stresc(file_to_analyze, "'", '\\', '\'');
+        mr_asprintf(syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);    // " MONDO_LOGFILE);
         mr_free(tmp);
-
-        mr_asprintf(syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
-        mr_free(strtmp);
-
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -480 +477 @@
         mr_free(command);
 
-        retval =
-            gen_aux_list(filelist, "getfacl --all-effective -P \"%s\"", facl_fname);
+        retval = gen_aux_list(filelist, "getfacl --all-effective -P ", facl_fname);
     }
     return (retval);
@@ -496 +492 @@
         run_program_and_log_output(command, 8);
         mr_free(command);
-        retval =
-            gen_aux_list(filelist, "getfattr --en=hex -m - -h -d \"%s\"", fattr_fname);
+        retval = gen_aux_list(filelist, "getfattr --en=hex -m - -h -d ", fattr_fname);
     }
     return (retval);
@@ -1338 +1333 @@
 
     /* dir is needed when we pass it to the shell */
-    dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
+    dir = mr_stresc(dir1, "'", '\\', '\'');
     p = strrchr(dir1, '/');
     if (p) {
@@ -1346 +1341 @@
         }
     }
-    mr_asprintf(find_excludes, "|");
+    mr_asprintf(find_excludes, " ");
 
     if (!depth) {
-        mr_asprintf(find_excludes, "|");
         if (sth != NULL) {
-            while((token = mr_strtok(sth, delims, &lastpos))) {
+            while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
                 mr_strcat(find_excludes," -path %s -prune -o", token);
                 mr_free(token);
@@ -1365 +1359 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
@@ -1422 +1416 @@
 //  log_msg(0, "Cataloguing %s", dir);
     mr_asprintf(skip_these, "|%s|", sth);
+    
     mr_asprintf(new_with_pipe, "|%s|", dir1);
     if ((dip = opendir(dir1)) == NULL) {
@@ -1441 +1436 @@
             }
             mr_free(new_with_pipe);
+            mr_asprintf(new_with_pipe, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
@@ -1493 +1489 @@
 
 
-
 /**
  * Create the filelist for the backup. It will be stored in [scratchdir]/archives/filelist.full.
@@ -1592 +1587 @@
         mr_asprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
         make_hole_for_file(g_skeleton_filelist);
+
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
         log_msg(2, "Opening out filelist to %s", sz_filelist);
@@ -1597 +1593 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        if ((!include_paths) || (strlen(include_paths) == 0)) {
+        if ((include_paths != NULL) && (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
@@ -1668 +1664 @@
 
     if (bkpinfo->make_filelist) {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
+        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
+        res = mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 
@@ -1799 +1793 @@
                 }
                 log_msg(5, "Found '%s'", fname);
-                tmp = mr_stresc(fname, "[]*?", '\\');
+                tmp = mr_stresc(fname, "[]*?", '\\', "'");
                 mr_free(fname);
                 fname = tmp;

branches/3.1/mondo/src/common/libmondo-files.c

@@ -145 +145 @@
     fin = popen(command, "r");
     mr_free(command);
+
     if (fin) {
         if (feof(fin)) {
@@ -216 +217 @@
     assert_string_is_neither_NULL_nor_zerolength(inout);
     mr_asprintf(infname, "%s.in", inout);
-    mr_asprintf(outfname, "%s", inout);
     mr_asprintf(tmp, "cp -f %s %s", inout, infname);
     run_program_and_log_output(tmp, FALSE);
@@ -226 +226 @@
         return;
     }
+
+    mr_asprintf(outfname, "%s", inout);
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
+        mr_free(infname);
         mr_free(outfname);
         return;
@@ -252 +255 @@
     mr_free(infname);
 }
-
-
-
-
-
-
-
 
 
@@ -271 +267 @@
 
     char *tmp = NULL;
-    char *command = NULL;;
-    char *kernel = NULL;;
+    char *command = NULL;
+    char *kernel = NULL;
 
     kernel = call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null",TRUE);
@@ -308 +304 @@
 
 
-
-
-
-
 /**
  * Find location of specified executable in user's PATH.
@@ -358 +350 @@
     return (output);
 }
-
-
-
-
-
-
 
 
@@ -659 +645 @@
     return (0);
 }
-
-
 
 
@@ -1028 +1012 @@
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
+    mr_free(command);
 
     tmp = call_program_and_get_last_line_of_output("which mondorestore",TRUE);
@@ -1099 +1084 @@
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
-    mr_asprintf(command, "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
+    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
     netfs_dev = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
@@ -1119 +1104 @@
     mr_free(command);
 
+    mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
+    netfs_client_hwaddr = call_program_and_get_last_line_of_output(command);
+    mr_free(command);
+
+    log_it("netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s", netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
     if (strlen(netfs_dev) < 2) {
         fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
@@ -1124 +1114 @@
 
     /********
-    * If the Network device that found above is a bonded device, 
+    * If the Network device found above is a bonded device, 
     * we need to replace it with an ethN device or the
     * networking will not start during an Network restore.
@@ -1153 +1143 @@
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
-    mr_free(tmp);
-    mr_free(netfs_mount);
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
+    mr_free(netfs_client_hwaddr);
+    mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_hwaddr);
+    mr_free(netfs_client_ipaddr);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_netmask);
+    mr_free(netfs_client_netmask);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_broadcast);
+    mr_free(netfs_client_broadcast);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_defgw);
+    mr_free(netfs_client_defgw);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    mr_free(netfs_server_ipaddr);
     mr_free(tmp);
 
@@ -1198 +1189 @@
     write_one_liner_data_file(tmp, bkpinfo->prefix);
     mr_free(tmp);
+
+    sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
+    mr_free(tmp);
+
 
     log_it("Finished storing Network configuration");
@@ -1228 +1224 @@
     long long scratchLL;
 
-    if (bkpinfo->media_size[1] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         log_to_screen("Number of media required: UNKNOWN");
         return;
@@ -1234 +1230 @@
 
     log_it("Estimating number of media required...");
-    scratchLL =
-        (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
-        + (long long) (size_of_all_biggiefiles_K());
-    scratchLL = (scratchLL / 1024) / bkpinfo->media_size[1];
+    scratchLL = (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size) + (long long) (size_of_all_biggiefiles_K());
+    scratchLL = (scratchLL / 1024) / bkpinfo->media_size;
     scratchLL++;
     if (bkpinfo->use_lzo) {

branches/3.1/mondo/src/common/libmondo-fork.c

@@ -123 +123 @@
     char *cd_number_str = NULL;
     char *command = NULL;
-    char *p;
+    char *p= NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
@@ -140 +140 @@
 
     mr_asprintf(cd_number_str, "%d", cd_no);
+    midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
     log_msg(4, "basic call = '%s'", tmp1);
-    midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
     mr_free(tmp1);
 
+    tmp = resolve_naff_tokens(midway_call, cd_number_str, "_CD#_");
     log_msg(4, "midway_call = '%s'", midway_call);
-    tmp = resolve_naff_tokens(midway_call, cd_number_str, "_CD#_");
     mr_free(cd_number_str);
     mr_free(midway_call);
 
-    log_msg(4, "tmp = '%s'", tmp);
     ultimate_call = resolve_naff_tokens(tmp, MONDO_LOGFILE, "_ERR_");
+    log_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_free(tmp);
 
-    log_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_asprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
     mr_free(ultimate_call);
 
-    log_to_screen
-        ("Please be patient. Do not be alarmed by on-screen inactivity.");
-    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
-            what_i_am_doing);
+    log_to_screen("Please be patient. Do not be alarmed by on-screen inactivity.");
+    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'", what_i_am_doing);
     if (bkpinfo->manual_cd_tray) {
         mr_asprintf(tmp2, "%s", command);
         p = strstr(tmp2, "2>>");
         if (p) {
-            *p++ = ' ';
-            *p++ = ' ';
-            *p++ = ' ';
+            sprintf(p, "   ");
             while (*p == ' ') {
                 p++;
@@ -376 +371 @@
         return (1);
     }
-    mr_free(command);
 
     if (!does_file_exist(lockfile)) {
@@ -384 +378 @@
         }
     }
+    mr_free(command);
 
     for (; does_file_exist(lockfile); sleep(1)) {
@@ -535 +530 @@
             bytes_to_be_read = atol(tmp1);
         }
+    }
+
+    if (direction == 'w') {
+        mr_asprintf(tmp, "%-64s", PIMP_END_SZ);
+        if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_free(tmp);
+            fatal_error("Can't write the final block");
+        }
+        mr_free(tmp);
+    } else {
         log_msg(1, "tmpA is %s", tmp1);
         if (!strstr(tmp1, PIMP_END_SZ)) {
@@ -554 +559 @@
                 }
 
-                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
+                mr_asprintf(tmp, "I am here - %lld", (long long)ftello(fin));
                 if (fread(tmp, 1, tmpcap, fin)) {
+                    mr_free(tmp);
                     fatal_error("Can't fread here");
                 }
                 log_msg(0, "tmp = '%s'", tmp);
                 if (fwrite(tmp, 1, tmpcap, ftmp)) {
+                    mr_free(tmp);
                     fatal_error("Can't fwrite there");
                 }
                 fclose(ftmp);
-                mr_free(tmp1);
+                mr_free(tmp);
                 fatal_error("Missing terminating block");
             }
         }
-        mr_free(tmp1);
-    }
+    }
+    mr_free(tmp1);
 
     paranoid_free(buf);
@@ -595 +602 @@
     command = find_home_of_exe("ntfsclone");
     if (!command) {
-        mr_free(command);
         fatal_error("ntfsclone not found");
     }
@@ -641 +647 @@
     /*@ buffers *********************************************************** */
     char *command = NULL;
-    char *title = NULL;
     /*@ pointers ********************************************************** */
     static int chldres = 0;
@@ -659 +664 @@
 
     log_msg(8, "Parent running");
-    mr_asprintf(title, "%s", tt);
-    open_evalcall_form(title);
-    mr_free(title);
+    open_evalcall_form(tt);
 
     for (sleep(1); command[0] != '\0'; sleep(1)) {
@@ -672 +675 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            mr_asprintf(title, "Verifying...");
-            open_evalcall_form(title);
-            mr_free(title);
+            open_evalcall_form("Verifying...");
         }
         if (counter++ >= 5) {

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

@@ -587 +587 @@
 
     /* Look for duplicate mountpoints in mountlist. */
-
     for (currline = 0; currline < mountlist->entries; currline++) {
         mr_asprintf(curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
@@ -743 +742 @@
     for (i = 0; i < mountlist->entries; i++) {
         if (strstr(mountlist->el[i].mountpoint, "raid")) {
-            used_by = which_raid_device_is_using_this_partition(raidlist,
-                                                          mountlist->el[i].
-                                                          device);
+            used_by = which_raid_device_is_using_this_partition(raidlist, mountlist->el[i].device);
             if (used_by < 0) {
                 memcpy((void *) &output_list->el[items++],

branches/3.1/mondo/src/common/libmondo-raid.c

@@ -1233 +1233 @@
     row++;
     }
-// free string
-mr_free(string);
+    // free string
+    mr_free(string);
 }
 // close file

branches/3.1/mondo/src/common/libmondo-stream.c

@@ -193 +193 @@
         }
         if (should_we_write_to_next_tape
-            (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
+            (bkpinfo->media_size, (off_t)256 * 1024)) {
             start_to_write_to_next_tape();
         }
@@ -206 +206 @@
       {
         fwrite (blk, 1, 256*1024, g_tape_stream);
-        if (should_we_write_to_next_tape (bkpinfo->media_size[g_current_media_number], 256*1024))
+        if (should_we_write_to_next_tape (bkpinfo->media_size, 256*1024))
           {
             start_to_write_to_next_tape ();
@@ -278 +278 @@
         mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
         mr_free(tmp);
+        mr_free(cdr_exe);
         return(dev);
     }
@@ -288 +289 @@
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
+        mr_free(cdr_exe);
         mr_free(tmp);
         return(NULL);
@@ -295 +297 @@
     mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1", cdr_exe);
     mr_free(cdr_exe);
+
     tmp = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
@@ -812 +815 @@
     log_to_screen("Reading stream");
     log_it("stream device = '%s'", bkpinfo->media_device);
-/* skip data disks */
+    /* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
     log_to_screen("Skipping data disks on stream");
@@ -937 +940 @@
 }
 if (bkpinfo->media_device == NULL) {
-    log_it("Unable to openout NULL dvice");
+    log_it("Unable to openout NULL device");
     return(1);
 }
@@ -1305 +1308 @@
     char *pA;
     char *pB;
+    int res;
     int ctrl_chr;
-    int res;
     char *temp_fname;
     char *datablock;
@@ -1325 +1328 @@
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
         res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        if (res) {
+            // FIXME
+        }
         if (ctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             break;
@@ -1472 +1478 @@
     log_it("New tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too
-    if (g_current_media_number > MAX_NOOF_MEDIA) {
-        res++;
-        log_to_screen("Too many tapes. Man, you need to use nfs!");
-    }
     if (bkpinfo->backup_media_type == cdstream) {
         mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE, MONDO_LOGFILE);
@@ -1663 +1665 @@
     filesize = length_of_file(infile);
     if (should_we_write_to_next_tape
-        (bkpinfo->media_size[g_current_media_number], filesize)) {
+        (bkpinfo->media_size, filesize)) {
         start_to_write_to_next_tape();
         write_backcatalog_to_tape();

branches/3.1/mondo/src/common/libmondo-string.c

@@ -141 +141 @@
 
 
-
-
-
-
-
-
-
 /**
  * Turn an entry from the RAID editor's disklist into a GUI-friendly string.
@@ -186 +179 @@
     long outval;
     int i;
-    char *tmp1 = NULL;
+    char *tmp = NULL;
     char ch;
 
@@ -198 +191 @@
     }
 
-    mr_asprintf(tmp1, "%s", incoming);
-    i = (int) strlen(tmp1);
-    if (tmp1[i - 1] == 'B' || tmp1[i - 1] == 'b') {
-        tmp1[i - 1] = '\0';
-    }
-    for (i = 0; i < (int) strlen(tmp1) && isdigit(tmp1[i]); i++);
-    ch = tmp1[i];
-    tmp1[i] = '\0';
-    outval = atol(tmp1);
-    paranoid_free(tmp1);
+    mr_asprintf(tmp, "%s", incoming);
+    i = (int) strlen(tmp);
+    if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
+        tmp[i - 1] = '\0';
+    }
+    for (i = 0; i < (int) strlen(tmp) && isdigit(tmp[i]); i++);
+    ch = tmp[i];
+    tmp[i] = '\0';
+    outval = atol(tmp);
+    mr_free(tmp);
 
     if (ch == 'g' || ch == 'G') {
@@ -224 +217 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        mr_asprintf(tmp1, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
-        fatal_error(tmp1);
+        mr_asprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
+        fatal_error(tmp);
     }
     return (outval);
@@ -1043 +1036 @@
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         mr_asprintf(tmp, "%lld", g_tape_posK);
         mr_asprintf(pos_w_commas, "%s", commarize(tmp));
@@ -1052 +1045 @@
     }
 
-/* update screen */
+    /* update screen */
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        percentage =
-            (int) (g_tape_posK / 10 /
-                   bkpinfo->media_size[g_current_media_number]);
+        percentage = (int) (g_tape_posK / 10 / bkpinfo->media_size);
         if (percentage > 100) {
             percentage = 100;
@@ -1062 +1053 @@
         mr_asprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
-        percentage =
-            (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 /
-                   bkpinfo->media_size[g_current_media_number]);
+        percentage = (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         mr_asprintf(outstr, "%s %d: [", mds, g_current_media_number);

branches/3.1/mondo/src/common/libmondo-tools-EXT.h

@@ -3 +3 @@
 extern void clean_up_KDE_desktop_if_necessary(void);
 extern long get_time();
+extern char *mr_date(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,

branches/3.1/mondo/src/common/libmondo-tools.c

@@ -57 +57 @@
  */
 char *g_mondo_home = NULL;
+
+/**
+ * The serial string (used to differentiate between backups) of the current backup.
+ */
+char *g_serial_string = NULL;
 
 /**
@@ -363 +368 @@
     assert(bkpinfo != NULL);
 
-    if (!bkpinfo->tmpdir) {
-        fatal_error("Tmpdir set to NULL !");
-    }
-
     bkpinfo->optimal_set_size =
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
         1024;
-
-    if (strlen(bkpinfo->tmpdir) < 2) {
-        log_it("tmpdir is blank/missing");
-        retval++;
-    }
 
     log_msg(1, "Post-param");
@@ -393 +389 @@
         }
         mr_free(tmp);
-    }
-    if (bkpinfo->scratchdir) {
-        make_hole_for_dir(bkpinfo->scratchdir);
-        chmod(bkpinfo->scratchdir, 0700);
-    } else {
-        fatal_error("Scratchdir set to NULL !");
     }
     if (bkpinfo->backup_media_type == iso)
@@ -461 +451 @@
     }
 #endif
-        else
-        {
+        else {
             mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
-            paranoid_free(mondo_mkisofs_sz);
             fatal_error("Manual CD tray + DVD not supported yet.");
             // -m isn't supported by growisofs, BTW...
-        } else {
-            if (bkpinfo->media_device == NULL) {
-                return(1);
-            }
+        } else {}
             mr_free(bkpinfo->call_make_iso);
             mr_asprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
-            paranoid_free(mondo_mkisofs_sz);
-        }
+        }
+        mr_free(mondo_mkisofs_sz);
         if (getenv ("SUDO_COMMAND")) {
             mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
@@ -506 +491 @@
         }
         if (find_home_of_exe("cdrecord")) {
-            strcpy(cdr_exe, "cdrecord");
+            mr_asprintf(cdr_exe, "cdrecord");
         } else if (find_home_of_exe("dvdrecord")) {
-            strcpy(cdr_exe, "dvdrecord");
+            mr_asprintf(cdr_exe, "dvdrecord");
         } else {
             mr_free(tmp);
@@ -569 +554 @@
         }
         mr_free(cdr_exe);
-        paranoid_free(mondo_mkisofs_sz);
-        paranoid_free(extra_cdrom_params);
+        mr_free(mondo_mkisofs_sz);
+        mr_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -587 +572 @@
         iso_dev = call_program_and_get_last_line_of_output(command,TRUE);
         log_it("res of it = %s", iso_dev);
+        mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_dev);
+        mr_free(tmp);
         mr_free(command);
 
@@ -595 +583 @@
         iso_mnt = call_program_and_get_last_line_of_output(command,TRUE);
         log_it("res of it = %s", iso_mnt);
+        mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_mnt);
+        mr_free(tmp);
         mr_free(command);
 
@@ -602 +593 @@
             mr_asprintf(iso_path, "%s", "");
         } else {
-            // If iso_mnt is only / then iso_path is the full dir 
+            // If iso_mnt is only / then iso_path is the full dir
             // (the formula bellow doesn't work in this case)
             if (strcmp(iso_mnt, "/") == 0) {
@@ -614 +605 @@
         mr_free(iso_tmp);
 
+        mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, iso_path);
+        mr_free(tmp);
+
         log_it("isodir: %s", iso_path);
         mr_free(iso_path);
+
+        mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->prefix);
+        mr_free(tmp);
 
         log_it("iso-prefix: %s",  bkpinfo->prefix);
@@ -666 +665 @@
     }
     if (bkpinfo->include_paths == NULL) {
-        mr_asprintf(p, "/");
-        bkpinfo->include_paths = p;
+        mr_asprintf(bkpinfo->include_paths, "/");
     }
     g_backup_media_type = bkpinfo->backup_media_type;
@@ -731 +729 @@
     if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
         /* purging a potential old tmpdir */
-        log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
         if (chdir("/tmp")) {
             // FIXME
@@ -757 +754 @@
         finish(-1);
     }
-
     bkpinfo->tmpdir = p;
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
+
+    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
+}
+
+
+void setup_scratchdir(char *path) {
+
+    char *tmp = NULL;
+    char *p = NULL;
+
+    if (bkpinfo->scratchdir != NULL) {
+        /* purging a potential old scratchdir */
+        if (chdir("/tmp")) {
+            // FIXME
+        }
+        if (strstr(bkpinfo->scratchdir,"mondo.scratch.") != NULL) {
+            log_it("Purging old scratchdir %s", bkpinfo->scratchdir);
+            mr_asprintf(tmp,"rm -Rf %s",bkpinfo->scratchdir);
+        } else {
+            log_it("Purging old scratchdir %s/mondo.scratch.*", bkpinfo->scratchdir);
+            mr_asprintf(tmp,"rm -Rf %s/mondo.scratch.*",bkpinfo->scratchdir);
+        }
+        paranoid_system(tmp);
+        mr_free(tmp);
+    }
+
+    /* Always take in account arg first, then env, then default */
+    if (path != NULL) {
+        mr_asprintf(tmp, "%s/mondo.scratch.XXXXXX", path);
+    } else if (getenv("MRSCRATCH")) {
+        mr_asprintf(tmp, "%s/mondo.scratch.XXXXXX", getenv("MRSCRATCH"));
+    } else {
+        mr_asprintf(tmp, "/tmp/mondo.scratch.XXXXXX");
+    }
+    p = mkdtemp(tmp);
+    if (p == NULL) {
+        log_it("Failed to create global scratch directory %s for Mondo.",tmp);
+        finish(-1);
+    }
+    strcpy(bkpinfo->scratchdir,p);
+    log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
+    paranoid_free(tmp);
+
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
 }
 
@@ -805 +849 @@
     bkpinfo = (struct s_bkpinfo *)mr_malloc(sizeof(struct s_bkpinfo));
 
-    /*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
-    setup_tmpdir(NULL);
-
     /* Initialized in same order as in the structure declaration to detect errors more easily */
     bkpinfo->media_device = NULL;
-    for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-        bkpinfo->media_size[i] = -1;
-    }
+    bkpinfo->media_size = -1;
     bkpinfo->boot_loader = '\0';
     bkpinfo->boot_device = NULL;
@@ -828 +866 @@
     bkpinfo->use_star = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
+    
+/*  We need tmpdir as early as possible for further function calls */
+    bkpinfo->tmpdir = NULL;         // Really setup after
+    setup_tmpdir(NULL);
+    setup_scratchdir(NULL);
+
     bkpinfo->disaster_recovery = am_I_in_disaster_recovery_mode();
     if (bkpinfo->disaster_recovery) {
@@ -835 +879 @@
     }
     mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
-    /*   bkpinfo->tmpdir is here in the struct */
-    bkpinfo->scratchdir = NULL;     // Really setup after
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
+    bkpinfo->exclude_paths = NULL;
     bkpinfo->include_paths = NULL;
-    bkpinfo->exclude_paths = NULL;
     bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path = NULL;
@@ -850 +892 @@
     bkpinfo->kernel_path = NULL;
     bkpinfo->netfs_mount = NULL;
+    bkpinfo->netfs_proto = NULL;
+    bkpinfo->netfs_user = NULL;
     bkpinfo->netfs_remote_dir = NULL;
-    bkpinfo->netfs_user = NULL;
-    bkpinfo->netfs_proto = NULL;
     bkpinfo->postnuke_tarball = NULL;
     bkpinfo->subdir = NULL;
@@ -864 +906 @@
     bkpinfo->use_obdr = FALSE;
     bkpinfo->restore_mode = interactive;
-
-    sensibly_set_scratchdir();
-}
-
-
+}
 
 
@@ -1218 +1256 @@
     mr_asprintf(command, "mount | grep -Ew '/boot'");
     mr_free(tmp);
+
     tmp = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
 
     if (!strcmp(tmp,"")) {
-        if ((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=")!= NULL)) {
+        if ((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=") != NULL)) {
             if (!run_program_and_log_output("mount /boot", 5)) {
                 strcpy(g_boot_mountpt, "/boot");

branches/3.1/mondo/src/common/libmondo-tools.h

@@ -6 +6 @@
 
 long get_time();
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
+char *mr_date(void);
+extern void (*log_debsug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,
                               const char *fmt, ...);

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

@@ -161 +161 @@
     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++;
@@ -305 +304 @@
                     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);
-                    if (system(tmp)) {
-                        //FIXME
-                    }
+                    paranoid_system(tmp);
                     mr_free(tmp);
 
@@ -637 +634 @@
     char *orig_cksum = NULL;
     char *tmp = NULL;
-    char *slice_fnam;
+    char *slice_fnam = NULL;
 
     /*@ pointers ******************************************************** */

branches/3.1/mondo/src/common/mondostructures.h

@@ -23 +23 @@
  */
 
-
-/** @def MAX_NOOF_MEDIA The maximum number of media that can be used in any one backup. */
-///* So we can override it in config.h: */
-//#ifndef MAX_NOOF_MEDIA
-#define MAX_NOOF_MEDIA 50
-//#endif
 
 /**
@@ -343 +337 @@
 
   /**
-   * An array containing the sizes of each media in our backup set, in MB.
-   * For example, media 1's size would be stored in media_size[1].
-   * Element 0 is unused.
+   * A field containing the sizes of the media in our backup set, in MB.
    * If the size should be autodetected, make it -1 (preferable) or 0.
-   * @bug This should probably be only one variable, not an array.
-   */
-    long media_size[MAX_NOOF_MEDIA + 1];
+   */
+    long media_size;
 
   /**

branches/3.1/mondo/src/common/newt-specific.c

@@ -122 +122 @@
 
         /*@ buffers ********************************************************** */
-        int i;
-        char *tmp;
+        int i = 0;
+        char *tmp = NULL;
 
         assert_string_is_neither_NULL_nor_zerolength(prompt);
@@ -173 +173 @@
         int i;
 
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
         if (g_fail_immediately) {
             // We consider the user aborted by using the -F option
@@ -326 +327 @@
         paranoid_system("killall mindi 2> /dev/null");
         kill_anything_like_this("/mondo/do-not");
-        kill_anything_like_this("tmp.mondo");
+        kill_anything_like_this("mondo.tmp");
         kill_anything_like_this("ntfsclone");
         sync();
@@ -420 +421 @@
         free_newt_stuff();
         if (!g_text_mode) {
-            log_msg(1, "Calling newtFinished()");
-            newtFinished();
+            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
+                log_msg(1, "Calling newtFinished()");
+                newtFinished();
+            } else {
+                log_msg(1, "Calling newtSuspend()");
+                newtSuspend();
+            }
         }
         printf("Execution run ended; result=%d\n", signal);
@@ -440 +446 @@
         char *command = NULL;
         char *tmp = NULL;
+        char *p = NULL;
 
         /*@ pointers ********************************************************* */
@@ -465 +472 @@
                 for (err_log_lines[i][0] = '\0';
                      strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    if (fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin)) {
-                        //FIXME
+                    p = fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin);
+                    if (!p) {
+                        // FIXME
                     }
                     /* Commented to make valgrind happy and avoid crash
@@ -571 +579 @@
 
         /*@ buffers ********************************************************* */
-        char *title = NULL;
         char *tmp = NULL;
 
@@ -580 +587 @@
         assert(ttl != NULL);
         malloc_string(tmp);
-        mr_asprintf(title, "%s", ttl);
-        strcpy(g_isoform_header_str, title);
-        if (g_text_mode) {
-            log_msg(0, title);
-        } else {
-            strcpy(tmp, title);
+        strcpy(g_isoform_header_str, ttl);
+        if (g_text_mode) {
+            log_msg(0, ttl);
+        } else {
+            strcpy(tmp, ttl);
             center_string(tmp, 80);
             newtPushHelpLine(tmp);
@@ -596 +602 @@
             g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
             g_isoform_scale = newtScale(3, 3, 34, 100);
-            newtCenteredWindow(40, 7, title);
+            newtCenteredWindow(40, 7, ttl);
             g_isoform_main = newtForm(NULL, NULL, 0);
             g_isoform_timeline = newtLabel(1, 5, "                    ");
@@ -607 +613 @@
         }
         update_evalcall_form(0);
-        mr_free(title);
         paranoid_free(tmp);
     }
@@ -971 +976 @@
                 }
                 if (percentage >= 3) {
-                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, time_remaining / 60, time_remaining % 60);
+                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
                     printf("---evalcall---1--- %s\n", g_isoform_header_str);
                     printf("---evalcall---2--- %s\n", taskprogress);
@@ -1225 +1230 @@
         mr_free(title_sz);
         mr_free(minimsg_sz);
-        paranoid_free(outstr);
         return (output);
     }
@@ -1369 +1373 @@
         log_msg(2, "Loading %s", source_file);
         for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; ) {
-            if (tmp != NULL) {
-                mr_free(tmp);
-            }
+            mr_free(tmp);
             if (feof(fin)) {
                 break;
@@ -1568 +1570 @@
             }
         }
-
         newtFormDestroy(myForm);
         newtPopWindow();