Changeset 2325 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

r3336@localhost: bruno | 2009-08-11 16:32:36 +0200

• bkpinfo->media_device, bkpinfo->nfs_remote_dir, and bkpinfo->nfs_mount are now dynamically allocated
• new interfaces for find_cdrom_device(), find_tape_device_and_size(), find_dvd_device(), find_cdrw_device(), set_dev_to_this_if_rx_OK() and read_cfg_var() which allocate the string now returned
• Better differentiation between ISO and NFS iso file names construction

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (19 diffs)
• common/libmondo-cli.c (modified) (11 diffs)
• common/libmondo-devices-EXT.h (modified) (4 diffs)
• common/libmondo-devices.c (modified) (55 diffs)
• common/libmondo-devices.h (modified) (3 diffs)
• common/libmondo-filelist.c (modified) (3 diffs)
• common/libmondo-files-EXT.h (modified) (1 diff)
• common/libmondo-files.c (modified) (2 diffs)
• common/libmondo-files.h (modified) (1 diff)
• common/libmondo-fork.c (modified) (1 diff)
• common/libmondo-stream-EXT.h (modified) (1 diff)
• common/libmondo-stream.c (modified) (21 diffs)
• common/libmondo-stream.h (modified) (1 diff)
• common/libmondo-tools-EXT.h (modified) (1 diff)
• common/libmondo-tools.c (modified) (12 diffs)
• common/libmondo-tools.h (modified) (1 diff)
• common/libmondo-verify.c (modified) (3 diffs)
• common/libmondo-verify.h (modified) (1 diff)
• common/mondostructures.h (modified) (3 diffs)
• mondoarchive/mondoarchive.c (modified) (3 diffs)
• mondorestore/mondo-prep.c (modified) (2 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (3 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (6 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (27 diffs)
• mondorestore/mondorestore.c (modified) (15 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)

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

@@ -561 +561 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mr_asprintf(tape_size_sz, "%ld", bkpinfo->media_size[1]);
-        ntapedev = get_non_rewind_dev(bkpinfo->media_device);
+        if (bkpinfo->media_device) {
+            ntapedev = get_non_rewind_dev(bkpinfo->media_device);
+        }
         if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
-            strncpy(bkpinfo->media_device,ntapedev,(size_t)(MAX_STR_LEN / 4));
+            mr_free(bkpinfo->media_device);
+            mr_asprintf(bkpinfo->media_device,"%s",ntapedev);
         } else {
             if (ntapedev == NULL) {
@@ -569 +572 @@
             }
         }
-        paranoid_free(ntapedev);
-        mr_asprintf(tape_device, "%s", bkpinfo->media_device);
+        mr_free(ntapedev);
+        if (bkpinfo->media_device) {
+            mr_asprintf(tape_device, "%s", bkpinfo->media_device);
+        } else {
+            mr_asprintf(tape_device, "");
+        }
     } else {
         mr_asprintf(tape_size_sz, "%ld", 0L);;
@@ -759 +766 @@
         fatal_error("Unknown backup_media_type");
     }
-    if (bkpinfo->backup_media_type == usb) {
+    if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) {
         mr_asprintf(tmp2, "--usb %s", bkpinfo->media_device);
     } else {
@@ -1197 +1204 @@
     mr_free(data_disks_file);
 
-    mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix);
-    paranoid_system(command);
-    mr_free(command);
+    if ((bkpinfo->isodir != NULL) && (bkpinfo->prefix != NULL)) {
+        if (bkpinfo->nfs_remote_dir) {
+            // NFS
+            mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix);
+        } else {
+            // ISO
+            mr_asprintf(command, "rm -f %s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->prefix);
+        }
+        paranoid_system(command);
+        mr_free(command);
+    }
 
     wipe_archives(bkpinfo->scratchdir);
@@ -1516 +1531 @@
     log_msg(1, message_to_screen);
 
-    mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
+    if (bkpinfo->media_device) {
+        mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
+    } else {
+        mr_asprintf(tmp1, "");
+    }
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
@@ -1700 +1719 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                if (bkpinfo->media_device) {
+                    mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                } else {
+                    mr_asprintf(sz_blank_disk, "dvd+rw-format");
+                }
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
-                res =
-                    run_external_binary_with_percentage_indicator_NEW
-                    ("Blanking DVD disk", sz_blank_disk);
+                res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
                 if (res) {
                     log_to_screen
@@ -1820 +1841 @@
         || bkpinfo->backup_media_type == cdrw) {
         if (is_this_device_mounted(bkpinfo->media_device)) {
-            log_msg(2,
-                    "Warning - %s mounted. I'm unmounting it before I burn to it.",
-                    bkpinfo->media_device);
+            log_msg(2, "Warning - %s mounted. I'm unmounting it before I burn to it.", bkpinfo->media_device);
             mr_asprintf(tmp, "umount %s", bkpinfo->media_device);
             run_program_and_log_output(tmp, FALSE);
@@ -2604 +2623 @@
     /*@ buffers ********************************************* */
     char *tmp = NULL;
-    char *cdrom_dev;
+    char *cdrom_dev = NULL;
     char *cdrw_dev;
     char *our_serial_str = NULL;
@@ -2616 +2635 @@
     char *mds = NULL;
 
-    malloc_string(cdrom_dev);
     malloc_string(cdrw_dev);
     malloc_string(szcdno);
@@ -2634 +2652 @@
   gotos_make_me_puke:
     ok_go_ahead_burn_it = TRUE;
-    if (!find_cdrom_device(cdrom_dev, FALSE)) {
-/* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
-      log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
-      retract_CD_tray_and_defeat_autorun();
-*/
+    if ((cdrom_dev = find_cdrom_device(FALSE)) != NULL) {
+        /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
+        log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
+        retract_CD_tray_and_defeat_autorun();
+        */
         mr_asprintf(tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
@@ -2718 +2736 @@
         popup_and_OK(tmp);
         mr_free(tmp);
+        mr_free(cdrom_dev);
         goto gotos_make_me_puke;
     } else {
         log_msg(2, "paafcd: OK, going ahead and burning it.");
     }
+    mr_free(cdrom_dev);
 
     mds = media_descriptor_string(g_backup_media_type);
@@ -2730 +2750 @@
     mr_free(mds);
 
-    paranoid_free(cdrom_dev);
     paranoid_free(cdrw_dev);
     paranoid_free(mtpt);
@@ -3187 +3206 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
-    char *tmp1;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *cdno_fname = NULL;
     char *lastcd_fname = NULL;
@@ -3200 +3219 @@
     /*@ int *********************************************************** */
     int res = 0;
-
-    malloc_string(tmp);
 
     assert(bkpinfo != NULL);
@@ -3246 +3263 @@
         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]);
     }
-    mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+        fatal_error("Something wrong in your environement. Report to dev team");
+    }
+    if (bkpinfo->nfs_remote_dir) {
+        // NFS
+        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    } else {
+        // ISO
+        mr_asprintf(isofile, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+    }
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {
@@ -3256 +3282 @@
             && (bkpinfo->backup_media_type == cdr
                 || bkpinfo->backup_media_type == cdrw)) {
-            if (find_cdrom_device(tmp, FALSE))  // make sure find_cdrom_device() finds, records CD-R's loc
-            {
+            if ((tmp = find_cdrom_device(FALSE)) == NULL) { 
+                // make sure find_cdrom_device() finds, records CD-R's loc
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
+                // if it can't be found then force pausing
                 bkpinfo->manual_cd_tray = TRUE;
-            }                   // if it can't be found then force pausing
-            else {
+            } else {
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
             }
+            mr_free(tmp);
         }
         if (bkpinfo->verify_data && !res) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen
-                ("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
+            log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
             mr_free(mds);
             chdir("/");
@@ -3320 +3346 @@
 
     bkpinfo->verify_data = orig_vfy_flag_val;
-    mr_free(tmp);
     return (0);
 }
@@ -3353 +3378 @@
                             "Verifying archives against live filesystem");
         if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
+            mr_free(bkpinfo->media_device);
+            mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
         }
         verify_tape_backups();
@@ -3368 +3394 @@
         g_current_media_number = cdno;
         if (bkpinfo->backup_media_type != iso) {
-            find_cdrom_device(bkpinfo->media_device, FALSE);    // replace 0,0,0 with /dev/cdrom
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = find_cdrom_device(FALSE);   // replace 0,0,0 with /dev/cdrom
         }
         chdir("/");

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

@@ -114 +114 @@
         }
     }
-    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_strcat(bkpinfo->scratchdir, "/mondo.scratch.%ld", random() % 32767);
-
     mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
@@ -889 +879 @@
     if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
-        p = mr_find_tape_device();
-        if (!p) {
+        if ((tmp1 = find_tape_device_and_size(NULL)) == NULL) {
             fatal_error("Tape device not specified. I couldn't find it either.");
         }
+        strcpy(flag_val['d'], tmp1);
+        mr_free(tmp1);
         flag_set['d'] = TRUE;
         strcpy(flag_val['d'], p);
@@ -917 +908 @@
         }
         if (!flag_set['d']) {
-            if (!find_dvd_device(flag_val['d'], FALSE)) {
+            if ((tmp = find_dvd_device(flag_val['d'])) != NULL) {
+                strcpy(flag_val['d'],tmp);
+                mr_free(tmp);
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);
@@ -923 +916 @@
         }
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if (! bkpinfo->restore_data) {
             if (!find_home_of_exe("growisofs")) {
-                fatal_error
-                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!find_home_of_exe("dvd+rw-format")) {
-                fatal_error
-                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!flag_set['s']) {
                 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 strcat(flag_val['s'], "m");
-                log_to_screen
-                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
-                    flag_val['s']);
+                log_to_screen("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
                 flag_set['s'] = 1;
             }
@@ -948 +936 @@
     if (flag_set['t'] || flag_set['u']) {   /* tape size */
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if ((flag_set['O']) && (! bkpinfo->restore_data)) {
@@ -981 +968 @@
 
     if (flag_set['n']) {
-        strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
+        mr_free(bkpinfo->nfs_mount);
+        mr_asprintf(bkpinfo->nfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
+            mr_free(bkpinfo->nfs_remote_dir);
+            mr_asprintf(bkpinfo->nfs_remote_dir, "/");
         }
         /* test if we specified a user for the NFS dialog */
@@ -989 +978 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
+            bkpinfo->nfs_user = bkpinfo->nfs_mount;
             p++;
             /* new NFS mount */
-            strcpy(tmp,p);
+            bkpinfo->nfs_mount = p;
             p--;
             *p = '\0';
-            mr_asprintf(bkpinfo->nfs_user,"%s",p);
-            strcpy(bkpinfo->nfs_mount,tmp);
         }
         mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
@@ -1221 +1209 @@
             mr_free(tmp1);
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            mr_free(bkpinfo->nfs_remote_dir);
+            mr_asprintf(bkpinfo->nfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-            strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
+            mr_free(bkpinfo->media_device);
+            mr_asprintf(bkpinfo->media_device, "%s", flag_val['d']);
         }
     }
@@ -1245 +1235 @@
     }
 
-    if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
             tmp2 = popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
             if (tmp2 == NULL) {
+                fatal_error("User opted to cancel.");
+            }
+            bkpinfo->media_device = tmp2;
+        } else {
+            bkpinfo->media_device = find_cdrw_device();
+            if (bkpinfo->media_device == NULL) {
                 retval++;
-                log_to_screen("User opted to cancel.");
-            }
-            mr_free(tmp2);
-        } else if (find_cdrw_device(bkpinfo->media_device)) {
-            retval++;
-            log_to_screen
-                ("Tried and failed to find CD-R[W] drive automatically.\n");
-        } else {
-            flag_set['d'] = TRUE;
-            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+                log_to_screen("Tried and failed to find CD-R[W] drive automatically.\n");
+            } else {
+                flag_set['d'] = TRUE;
+                strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+            }
         }
     }
@@ -1288 +1278 @@
 
         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.");
@@ -1467 +1456 @@
     /*@ ints ** */
     int opt = 0;
-    char *tmp = NULL;
     int i = 0;
     int len;

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

@@ -9 +9 @@
 extern int find_and_mount_actual_cd(
                                     char *mountpoint);
-extern int find_cdrom_device(char *output, bool try_to_mount);
-extern int find_dvd_device(char *output, bool try_to_mount);
+extern char *find_cdrom_device(bool try_to_mount);
+extern char *find_dvd_device();
 extern long get_phys_size_of_drive(char *drive);
 extern bool is_this_a_valid_disk_format(char *format);
@@ -16 +16 @@
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);
-extern int mount_CDROM_here(char *device, char *mountpoint);
+extern int mount_CDROM_here(char *device, const char *mountpoint);
 extern long long size_of_specific_device_in_mountlist(struct
                                                       mountlist_itself
@@ -28 +28 @@
 
 
-extern int find_cdrw_device(char *cdrw_device);
+extern char *find_cdrw_device();
 
 
@@ -52 +52 @@
 
 
-extern bool set_dev_to_this_if_rx_OK(char *, char *);
+extern char *set_dev_to_this_if_rx_OK(char *);
 
 extern void retract_CD_tray_and_defeat_autorun(void);

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

@@ -64 +64 @@
 
 
-void set_g_cdrom_and_g_dvd_to_bkpinfo_value()
-{
-    strcpy(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
-    strcpy(g_dvd_drive_is_here, bkpinfo->media_device); // just in case
+void set_g_cdrom_and_g_dvd_to_bkpinfo_value() {
+
+    if (bkpinfo->media_device) {
+        strcpy(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
+        strcpy(g_dvd_drive_is_here, bkpinfo->media_device); // just in case
+    }
 }
 
@@ -205 +207 @@
     int res1 = 0, res2 = 0;
 
+    if (dev == NULL) {
+        return (1);
+    }
+
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
@@ -243 +249 @@
     char *command = NULL;
     int i;
+
+    if (dev == NULL) {
+        return (1);
+    }
 
 #ifdef __FreeBSD__
@@ -429 +439 @@
  * Try to mount CD-ROM at @p mountpoint. If the CD-ROM is not found or has
  * not been specified, call find_cdrom_device() to find it.
- * @param bkpinfo The backup information structure. The only field used is @c bkpinfo->media_device.
  * @param mountpoint Where to mount the CD-ROM.
  * @return 0 for success, nonzero for failure.
  * @see mount_CDROM_here
  */
-int find_and_mount_actual_cd(char *mountpoint)
-{
+int find_and_mount_actual_cd(char *mountpoint) {
+
     /*@ buffers ***************************************************** */
 
     /*@ int's  ****************************************************** */
     int res;
-    char *dev;
+    char *dev = NULL;
     char *p = NULL;
 
     /*@ end vars **************************************************** */
 
-    malloc_string(dev);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
     if (g_backup_media_type == dvd) {
-        strcpy(dev, g_dvd_drive_is_here);
-        if (!dev[0]) {
-            find_dvd_device(dev, FALSE);
+        if (g_dvd_drive_is_here[0]) {
+            mr_asprintf(dev, "%s", g_dvd_drive_is_here);
+        }
+        if (dev == NULL) {
+            dev = find_dvd_device();
         }
     } else {
-        strcpy(dev, g_cdrom_drive_is_here);
-        if (!dev[0]) {
-            find_cdrom_device(dev, FALSE);
+        if (g_cdrom_drive_is_here[0]) {
+            mr_asprintf(dev, "%s", g_cdrom_drive_is_here);
+        }
+        if (dev == NULL) {
+            dev = find_cdrom_device(FALSE);
         }
     }
@@ -465 +477 @@
     }
 
-    if (!dev[0] || (res = mount_CDROM_here(dev, mountpoint))) {
+    if ((dev == NULL) || (res = mount_CDROM_here(dev, mountpoint))) {
         p = popup_and_get_string ("CD-ROM device", "Please enter your CD-ROM's /dev device",dev);
         if (p == NULL) {
@@ -479 +491 @@
         log_msg(1, "mount succeeded with %s", dev);
     }
-    paranoid_free(dev);
+    mr_free(dev);
     return (res);
 }
@@ -493 +505 @@
  * @return 0 for success, nonzero for failure.
  */
-int find_cdrw_device(char *cdrw_device)
+char *find_cdrw_device()
 {
     /*@ buffers ************************ */
@@ -499 +511 @@
     char *cdr_exe = NULL;
     char *command = NULL;
+    char *cdrw_device = NULL;
 
     if (g_cdrw_drive_is_here[0]) {
-        strcpy(cdrw_device, g_cdrw_drive_is_here);
+        mr_asprintf(cdrw_device, g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
-        return (0);
+        return(cdrw_device);
     }
     if (g_backup_media_type == dvd) {
-        log_msg(1,
-                "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
-        return (1);
+        log_msg(1, "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
+        return(NULL);
     }
     run_program_and_log_output("insmod ide-scsi", -1);
@@ -524 +536 @@
         mr_free(tmp);
         mr_free(cdr_exe);
-        return 1;
+        return(NULL);
     } else {
-        strcpy(cdrw_device, tmp);
+        cdrw_device = tmp;
         log_it("Found CDRW device - %s", cdrw_device);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
-        mr_free(tmp);
         mr_free(cdr_exe);
-        return (0);
+        return (cdrw_device);
     }
 }
@@ -545 +556 @@
  * @return 0 for success, nonzero for failure.
  */
-int find_cdrom_device(char *output, bool try_to_mount)
+char *find_cdrom_device(bool try_to_mount)
 {
     /*@ pointers **************************************************** */
@@ -552 +563 @@
     char *q;
     char *r;
-    int retval = 0;
 
     /*@ bool's ****************************************************** */
@@ -558 +568 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
+    char *output = NULL;
     char *cdr_exe = NULL;
-    char *phrase_one;
-    char *phrase_two;
+    char *phrase_one = NULL;
+    char *phrase_two = NULL;
     char *command = NULL;
 #ifndef __FreeBSD__
@@ -571 +582 @@
 
     /*@ intialize *************************************************** */
-    malloc_string(tmp);
-    malloc_string(phrase_one);
-    malloc_string(phrase_two);
-
-    output[0] = '\0';
-    phrase_one[0] = '\0';
-    phrase_two[0] = '\0';
+
+    output = NULL;
 #ifndef __FreeBSD__
     mr_asprintf(dvd_last_resort, "%s", "");;
@@ -585 +591 @@
 
     if (g_cdrom_drive_is_here[0] && !isdigit(g_cdrom_drive_is_here[0])) {
-        strcpy(output, g_cdrom_drive_is_here);
+        mr_asprintf(output, "%s", g_cdrom_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
+        return(output);
     }
     if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
-        strcpy(output, the_last_place_i_found_it);
-        log_msg(3,
-                "find_cdrom_device() --- returning last found location - '%s'",
-                output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
+        mr_asprintf(output, "%s", the_last_place_i_found_it);
+        log_msg(3, "find_cdrom_device() --- returning last found location - '%s'", output);
+        return(output);
     }
 
@@ -607 +609 @@
         mr_asprintf(cdr_exe, "dvdrecord");
     }
-    tmp[0] = '\0';
+
     if (!find_home_of_exe(cdr_exe)) {
-        strcpy(output, "/dev/cdrom");
+        mr_asprintf(output, "/dev/cdrom");
         log_msg(4, "Can't find cdrecord; assuming %s", output);
+        mr_free(cdr_exe);
         if (!does_device_exist(output)) {
             log_msg(4, "That didn't work. Sorry.");
-            retval = 1;
-            goto end_of_find_cdrom_device;
+            mr_free(output);
+            return(output);
         } else {
-            retval = 0;
-            goto end_of_find_cdrom_device;
+            return(output);
         }
     }
@@ -629 +631 @@
         log_OS_error("Cannot popen command");
         mr_free(cdr_exe);
-        return (1);
-    }
-
+        return(NULL);
+    }
+
+    malloc_string(phrase_one);
+    phrase_one[0] = '\0';
+    malloc_string(phrase_two);
+    phrase_two[0] = '\0';
+
+    malloc_string(tmp);
+    tmp[0] = '\0';
     for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
          (void)fgets(tmp, MAX_STR_LEN, fin)) {
@@ -656 +665 @@
     }
     paranoid_pclose(fin);
+    paranoid_free(phrase_one);
 
 #ifndef __FreeBSD__
@@ -678 +688 @@
                             mr_free(dvd_last_resort);
                             mr_asprintf(dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4,
-                                    "Ignoring '%s' because it's a DVD drive",
-                                    tmp);
+                            log_msg(4, "Ignoring '%s' because it's a DVD drive", tmp);
                         } else {
-                            sprintf(output, "/dev/%s", tmp);
+                            mr_asprintf(output, "/dev/%s", tmp);
                             found_it = TRUE;
                         }
@@ -691 +699 @@
         }
     }
+    paranoid_free(phrase_two);
+    paranoid_free(tmp);
 
 #endif
@@ -696 +706 @@
     if (!found_it) {
         log_msg(4, "OK, approach 2");
-        if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/cdrom"))) {
-            if (!
-                (found_it =
-                 set_dev_to_this_if_rx_OK(output, "/dev/cdrom1"))) {
-                if (!
-                    (found_it =
-                     set_dev_to_this_if_rx_OK(output, "/dev/dvd"))) {
-                    if (!
-                        (found_it =
-                         set_dev_to_this_if_rx_OK(output, "/dev/acd0"))) {
-                        if (!
-                            (found_it =
-                             set_dev_to_this_if_rx_OK(output,
-                                                      "/dev/cd01"))) {
-                            if (!
-                                (found_it =
-                                 set_dev_to_this_if_rx_OK(output,
-                                                          "/dev/acd1"))) {
-                                if (!
-                                    (found_it =
-                                     set_dev_to_this_if_rx_OK(output,
-                                                              "/dev/cd1")))
-                                {
-                                    retval = 1;
-                                    goto end_of_find_cdrom_device;
+        if (!(output = set_dev_to_this_if_rx_OK("/dev/cdrom"))) {
+            if (!(output = set_dev_to_this_if_rx_OK("/dev/cdrom1"))) {
+                if (!(output = set_dev_to_this_if_rx_OK("/dev/dvd"))) {
+                    if (!(output = set_dev_to_this_if_rx_OK("/dev/acd0"))) {
+                        if (!(output = set_dev_to_this_if_rx_OK("/dev/cd01"))) {
+                            if (!(output = set_dev_to_this_if_rx_OK("/dev/acd1"))) {
+                                if (!(output = set_dev_to_this_if_rx_OK("/dev/cd1"))) {
+                                    mr_free(cdr_exe);
+                                    return(NULL);
                                 }
                             }
@@ -732 +726 @@
     if (!found_it && strlen(dvd_last_resort) > 0) {
         log_msg(4, "Well, I'll use the DVD - %s - as a last resort", dvd_last_resort);
-        strcpy(output, dvd_last_resort);
+        mr_asprintf(output, "%s", dvd_last_resort);
         found_it = TRUE;
     }
     mr_free(dvd_last_resort);
+
     if (found_it) {
-        sprintf(tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
-                strrchr(output, '/') + 1);
-        if (system(tmp) == 0) {
-            log_msg(4,
-                    "%s is not right. It's being SCSI-emulated. Continuing.",
-                    output);
+        mr_asprintf(tmp1, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null", strrchr(output, '/') + 1);
+        if (system(tmp1) == 0) {
+            log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);
             found_it = FALSE;
-            output[0] = '\0';
-        }
+            mr_free(output);
+        }
+        mr_free(tmp1);
     }
 
@@ -753 +746 @@
             found_it = FALSE;
             log_msg(4, "OK, I was wrong, I haven't found it... yet.");
+            mr_free(output);
         }
     }
@@ -758 +752 @@
     if (!found_it) {
         log_msg(4, "OK, approach 2");
-        if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/scd0"))) {
-            if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/sr0"))) {
-                if (!
-                    (found_it =
-                     set_dev_to_this_if_rx_OK(output, "/dev/cdrom"))) {
-                    if (!
-                        (found_it =
-                         set_dev_to_this_if_rx_OK(output,
-                                                  "/dev/cdrom0"))) {
-                        if (!
-                            (found_it =
-                             set_dev_to_this_if_rx_OK(output,
-                                                      "/dev/cdrom1"))) {
-                            if (!
-                                (found_it =
-                                 set_dev_to_this_if_rx_OK(output,
-                                                          "/dev/sr1"))) {
-                                if (!
-                                    (found_it =
-                                     set_dev_to_this_if_rx_OK(output,
-                                                              "/dev/dvd")))
-                                {
-                                    if (!
-                                        (found_it =
-                                         set_dev_to_this_if_rx_OK(output,
-                                                                  g_cdrw_drive_is_here)))
-                                    {
-                                        retval = 1;
-                                        goto end_of_find_cdrom_device;
+        if (!(output = set_dev_to_this_if_rx_OK("/dev/scd0"))) {
+            if (!(output = set_dev_to_this_if_rx_OK("/dev/sr0"))) {
+                if (!(output = set_dev_to_this_if_rx_OK("/dev/cdrom"))) {
+                    if (!(output = set_dev_to_this_if_rx_OK("/dev/cdrom0"))) {
+                        if (!(output = set_dev_to_this_if_rx_OK("/dev/cdrom1"))) {
+                            if (!(output = set_dev_to_this_if_rx_OK("/dev/sr1"))) {
+                                if (!(output = set_dev_to_this_if_rx_OK("/dev/dvd"))) {
+                                    if (!(output = set_dev_to_this_if_rx_OK(g_cdrw_drive_is_here))) {
+                                        mr_free(cdr_exe);
+                                        return(NULL);
                                     }
                                 }
@@ -802 +777 @@
             log_msg(4, "[Cardigans] I've changed my mind");
             found_it = FALSE;
+            mr_free(output);
         } else {
-            sprintf(tmp, "%s/archives", mountpoint);
+            mr_asprintf(tmp1, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
                 log_msg(4, "[Cardigans] I'll take it back");
                 found_it = FALSE;
+                mr_free(output);
             } else {
                 mr_asprintf(command, "umount %s", output);
@@ -814 +791 @@
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
+            mr_free(tmp1);
         }
     }
@@ -822 +800 @@
         if (!does_file_exist(output)) {
             log_msg(3, "I still haven't found it.");
-            return (1);
+            mr_free(cdr_exe);
+            mr_free(output);
+            return (NULL);
         }
         log_msg(3, "(find_cdrom_device) --> '%s'", output);
         strcpy(the_last_place_i_found_it, output);
         strcpy(g_cdrom_drive_is_here, output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
+        mr_free(cdr_exe);
+        return (output);
     }
 
     mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
+    mr_free(cdr_exe);
+
     log_msg(1, "command=%s", command);
     mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
+    mr_free(output);
     if (strlen(tmp1) > 0) {
-        strcpy(output, tmp1);
+        mr_asprintf(output, "%s", tmp1);
         log_msg(4, "Finally found it at %s", output);
-        retval = 0;
     } else {
         log_msg(4, "Still couldn't find it.");
-        retval = 1;
     }
     mr_free(tmp1);
 
-  end_of_find_cdrom_device:
-    paranoid_free(tmp);
-    mr_free(cdr_exe);
-    paranoid_free(phrase_one);
-    paranoid_free(phrase_two);
-    return (retval);
-}
-
-
-
-
-
-int find_dvd_device(char *output, bool try_to_mount)
+    return (output);
+}
+
+
+char *find_dvd_device()
 {
     char *tmp = NULL;
-    int retval = 0, devno = -1;
+    int devno = -1;
+    char *output = NULL;
 
     if (g_dvd_drive_is_here[0]) {
-        strcpy(output, g_dvd_drive_is_here);
+        mr_asprintf(output, g_dvd_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
-        return (0);
-    }
-
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
-        );
+        return (output);
+    }
+
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1"));
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
@@ -882 +855 @@
 
     if (devno >= 0) {
-        retval = 0;
-        sprintf(output, "/dev/scd%d", devno);
+        mr_asprintf(output, "/dev/scd%d", devno);
         strcpy(g_dvd_drive_is_here, output);
         log_msg(2, "I think DVD is at %s", output);
     } else {
         log_msg(2, "I cannot find DVD");
-        retval = 1;
-    }
-
-    if (try_to_mount) {
-        log_msg(1, "Ignoring the fact that try_to_mount==TRUE");
-    }
-    return (retval);
+    }
+
+    return (output);
 }
 
@@ -1079 +1047 @@
     /*@ end vars **************************************************** */
 
+    if (device_raw == NULL) {
+        return(FALSE);
+    }
+
     malloc_string(incoming);
-    assert(device_raw != NULL);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1213 +1184 @@
         return(1);
     }
-    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
-            mountpoint);
+    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device, mountpoint);
 
 #ifdef __FreeBSD__
@@ -1237 +1207 @@
  * @return 0 for success, nonzero for failure.
  */
-int mount_CDROM_here(char *device, char *mountpoint)
+int mount_CDROM_here(char *device, const char *mountpoint)
 {
     /*@ buffer ****************************************************** */
@@ -1248 +1218 @@
 #endif
 
-    assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
     make_hole_for_dir(mountpoint);
 
-    if (isdigit(device[0])) {
-        find_cdrom_device(device, FALSE);
+    if ((device == NULL) || (isdigit(device[0]))) {
+        mr_free(device);
+        device = find_cdrom_device(FALSE);
     }
 #ifndef __FreeBSD__
@@ -1268 +1238 @@
             fatal_error(command);
         }
-        strcpy(device, dev);
-        paranoid_free(dev);
+        mr_free(device);
+        device = dev;
 #else
         mr_strcat(options, ",loop");
@@ -1275 +1245 @@
 
     }
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
-            mountpoint);
+    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device, mountpoint);
     /*@ end vars *************************************************** */
 
@@ -1293 +1262 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    paranoid_free(command);
+    mr_free(command);
 
     return (retval);
@@ -1324 +1293 @@
     /*@ buffers ********************************************************* */
     char *tmp = NULL;
-    char *p = NULL;
     char *mds = NULL;
     char *request = NULL;
@@ -1342 +1310 @@
     mr_free(tmp);
 
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == nfs) {
+    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == nfs) {
+        // BERLIOS --- I'm tempted to do something about this...
+        // Why unmount and remount again and again?
         log_msg(3, "Remounting CD");
         g_ISO_restore_mode = TRUE;
-        // FIXME --- I'm tempted to do something about this...
-        // Why unmount and remount again and again?
         if (is_this_device_mounted(MNT_CDROM)) {
             run_program_and_log_output("umount " MNT_CDROM, 5);
@@ -1355 +1322 @@
         mr_free(tmp);
 
-        mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+        if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+            fatal_error("Unable to prepare ISO file name. Please report to dev team");
+        }
+        if (bkpinfo->nfs_remote_dir) {
+            // NFS
+            mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+        } else {
+            // ISO
+            mr_asprintf(tmp, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, cd_number_i_want);
+        }
         if (!does_file_exist(tmp)) {
             mr_free(tmp);
-            mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+            if (bkpinfo->nfs_remote_dir) {
+                // NFS
+                mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+            } else {
+                // ISO
+                mr_asprintf(tmp, "%s/isodir/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->prefix, cd_number_i_want);
+            }
             if (does_file_exist(tmp)) {
                 log_msg(1, "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir", bkpinfo->isodir, bkpinfo->tmpdir);
@@ -1373 +1355 @@
     }
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
-        log_msg(3, "Currently, we hold %d but we want %d", res,
-                cd_number_i_want);
+        log_msg(3, "Currently, we hold %d but we want %d", res, cd_number_i_want);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
@@ -1490 +1471 @@
             mds = media_descriptor_string(bkpinfo->backup_media_type);
             mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
+            mr_free(bkpinfo->media_device);
             if (bkpinfo->backup_media_type == dvd) {
-                find_dvd_device(bkpinfo->media_device, FALSE);
+                bkpinfo->media_device = find_dvd_device();
                 mr_asprintf(tmp, "1");
                 mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
-                strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
+                mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_CDROM);
                 mr_asprintf(tmp, "4");
                 mr_asprintf(sz_size, "%d", 650);
@@ -1542 +1524 @@
         mds = media_descriptor_string(bkpinfo->backup_media_type);
 
+        mr_free(bkpinfo->media_device);
         if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s",
-                    bkpinfo->media_device);
-        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))
-                   || bkpinfo->backup_media_type == dvd) {
-            if (!bkpinfo->media_device[0]) {
-                strcpy(bkpinfo->media_device, "/dev/cdrom");
-            }                   // just for the heck of it :)
-            log_msg(1, "bkpinfo->media_device = %s",
-                    bkpinfo->media_device);
-            if (bkpinfo->backup_media_type == dvd
-                || find_cdrom_device(bkpinfo->media_device, FALSE)) {
-                log_msg(1, "bkpinfo->media_device = %s",
-                        bkpinfo->media_device);
+            mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
+            log_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
+        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb)) || bkpinfo->backup_media_type == dvd) {
+            if ((bkpinfo->backup_media_type == dvd) || ((bkpinfo->media_device = find_cdrom_device(FALSE)) != NULL)) {
                 mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
                 p = popup_and_get_string("Device?", comment, bkpinfo->media_device);
@@ -1565 +1538 @@
                     finish(1);
                 }
-                strcpy(bkpinfo->media_device, p);
-                mr_free(p);
-            }
-            log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
+                mr_free(bkpinfo->media_device);
+                bkpinfo->media_device = p;
+            }
+            if (bkpinfo->media_device != NULL) {
+                log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
+            } else {
+                log_msg(2, "%s device not found (bkpinfo->media_device is NULL)", mds);
+            }
         } else {
-            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
-                bkpinfo->media_device[0] = '\0';
-            }
-            if (bkpinfo->media_device[0]) {
+            if (((bkpinfo->media_device = find_cdrw_device()) != NULL) && (bkpinfo->backup_media_type != usb)) {
+                mr_free(bkpinfo->media_device);
+            }
+            if (bkpinfo->media_device != NULL) {
                 if (bkpinfo->backup_media_type == usb) {
                     mr_asprintf(tmp, "I think your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
@@ -1580 +1557 @@
                 }
                 if (!ask_me_yes_or_no(tmp)) {
-                    bkpinfo->media_device[0] = '\0';
+                    mr_free(bkpinfo->media_device);
                 }
                 mr_free(tmp);
             }
-            if (!bkpinfo->media_device[0]) {
+            if (!bkpinfo->media_device) {
                 if (bkpinfo->backup_media_type == usb) {
-                    p = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device);
+                    p = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", NULL);
                 } else {
                     if (g_kernel_version < 2.6) {
-                        p = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device);
+                        p = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", NULL);
                     } else {
-                        p = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device);
+                        p = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", NULL);
                     }
                 }
@@ -1598 +1575 @@
                     finish(1);
                 }
-                strcpy(bkpinfo->media_device, p);
-                mr_free(p);
+                bkpinfo->media_device = p;
             }
         }
@@ -1618 +1594 @@
     case tape:
 
-        if ((!bkpinfo->restore_mode) && (!mr_find_tape_device())) {
+        mr_free(bkpinfo->media_device);
+        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = find_tape_device_and_size(NULL)) == NULL)) {
             log_msg(3, "Ok, using vanilla scsi tape.");
-            strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
+            mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
                 paranoid_fclose(fin);
             } else {
-                strcpy(bkpinfo->media_device, "/dev/osst0");
-            }
-        }
-        if (bkpinfo->media_device[0]) {
+                mr_free(bkpinfo->media_device);
+                mr_asprintf(bkpinfo->media_device, "/dev/osst0");
+            }
+        }
+        if (bkpinfo->media_device != NULL) {
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
                 paranoid_fclose(fin);
             } else {
                 if (does_file_exist("/tmp/mondo-restore.cfg")) {
-                    read_cfg_var("/tmp/mondo-restore.cfg", "media-dev",
-                                 bkpinfo->media_device);
+                    mr_free(bkpinfo->media_device);
+                    bkpinfo->media_device = read_cfg_var("/tmp/mondo-restore.cfg", "media-dev");
                 }
             }
         }
-        if (bkpinfo->media_device[0]) {
+        if (bkpinfo->media_device != NULL) {
             mr_asprintf(tmp, "I think I've found your tape streamer at %s; am I right on the money?", bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
-                bkpinfo->media_device[0] = '\0';
+                mr_free(bkpinfo->media_device);
             }
             mr_free(tmp);
         }
-        if (!bkpinfo->media_device[0]) {
+        if (bkpinfo->media_device == NULL) {
             p = popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device);
             if (p == NULL) {
@@ -1650 +1628 @@
                 finish(1);
             }
-            strcpy(bkpinfo->media_device, p);
-            mr_free(p);
+            bkpinfo->media_device = p;
         }
         mr_asprintf(tmp, "ls -l %s", bkpinfo->media_device);
@@ -1686 +1663 @@
 
         /* Initiate bkpinfo nfs_mount path from running environment if not already done */
-        if (!bkpinfo->nfs_mount[0]) {
-            strcpy(bkpinfo->nfs_mount,
-                   call_program_and_get_last_line_of_output
-                   ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (bkpinfo->nfs_mount == NULL) {
+            mr_asprintf(bkpinfo->nfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -1702 +1677 @@
                 finish(1);
             }
-            strcpy(bkpinfo->nfs_mount, p);
-            mr_free(p);
+            mr_free(bkpinfo->nfs_mount);
+            bkpinfo->nfs_mount = p;
             if (!bkpinfo->restore_data) {
                 if ((bkpinfo->compression_level =
@@ -1713 +1688 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            strip_spaces(bkpinfo->nfs_mount);
+            mr_strip_spaces(bkpinfo->nfs_mount);
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
@@ -1752 +1727 @@
                 finish(1);
             }
-            strcpy(bkpinfo->nfs_mount, p);
-            mr_free(p);
+            mr_free(bkpinfo->nfs_mount);
+            bkpinfo->nfs_mount = p;
         }
         /* Initiate bkpinfo isodir path from running environment if mount already done */
@@ -1782 +1757 @@
             finish(1);
         }
-        strcpy(bkpinfo->nfs_remote_dir, p);
-        mr_free(p);
+        mr_free(bkpinfo->nfs_remote_dir);
+        bkpinfo->nfs_remote_dir = p;
 
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces(bkpinfo->nfs_remote_dir);
+        mr_strip_spaces(bkpinfo->nfs_remote_dir);
 
         p = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
@@ -1998 +1973 @@
     }
     log_it("isodir = %s", bkpinfo->isodir);
-    log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
+    if (bkpinfo->nfs_mount) {
+        log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
+    }
     if (bkpinfo->nfs_user) {
         log_it("nfs_user = '%s'", bkpinfo->nfs_user);
@@ -2135 +2112 @@
         fatal_error("I couldn't figure out the scratchdir!");
     }
+
+    /* Cleaning a potential previous scratchdir */
+    if (bkpinfo->scratchdir) {
+        mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
+        paranoid_system(command);
+        mr_free(command);
+    }
     mr_free(bkpinfo->scratchdir);
+
     mr_asprintf(bkpinfo->scratchdir , "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
+    /* Cleaning potential previous scratchdir */
     mr_asprintf(command, "rm -Rf %s/mondo.scratch.*", tmp);
     mr_free(tmp);
@@ -2156 +2142 @@
  */
 /**
- * If we can read @p dev, set @p output to it.
- * If @p dev cannot be read, set @p output to "".
+ * If we can read @p dev, set @return output to it.
+ * If @p dev cannot be read, set @p output to NULL.
  * @param dev The device to check for.
- * @param output Set to @p dev if @p dev exists, "" otherwise.
- * @return TRUE if @p dev exists, FALSE if it doesn't.
- */
-bool set_dev_to_this_if_rx_OK(char *output, char *dev)
+ * @return output Set to @p dev if @p dev exists, NULL otherwise.
+ */
+char *set_dev_to_this_if_rx_OK(char *dev)
 {
     char *command = NULL;
-    bool res;
+    char *output = NULL;
 
     if (!dev || dev[0] == '\0') {
-        output[0] = '\0';
-        return (FALSE);
+        return(NULL);
     }
     log_msg(10, "Injecting %s", dev);
@@ -2175 +2159 @@
     if (!does_file_exist(dev)) {
         log_msg(10, "%s doesn't exist. Returning FALSE.", dev);
-        return (FALSE);
+        return(NULL);
     }
     mr_asprintf(command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null", 512L, dev);
     if (!run_program_and_log_output(command, FALSE)
         && !run_program_and_log_output(command, FALSE)) {
-        strcpy(output, dev);
+        mr_asprintf(output, "%s", dev);
         log_msg(4, "Found it - %s", dev);
-        res = TRUE;
     } else {
-        output[0] = '\0';
         log_msg(4, "It's not %s", dev);
-        res = FALSE;
     }
     mr_free(command);
-    return(res);
+    return(output);
 }
 
@@ -2221 +2202 @@
     }
 
-    mr_asprintf(mountdev, "%s", bkpinfo->media_device);
-    if (!mountdev[0]) {
+    if (bkpinfo->media_device) {
+        mr_asprintf(mountdev, "%s", bkpinfo->media_device);
+    }
+    if (!mountdev) {
         log_it("(what_number_cd_is_this) Warning - media_device unknown. Finding out...");
-        find_cdrom_device(bkpinfo->media_device, FALSE);
+        mr_free(bkpinfo->media_device);
+        bkpinfo->media_device = find_cdrom_device(FALSE);
+        mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     }
     if (!is_this_device_mounted(MNT_CDROM)) {

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

@@ -8 +8 @@
 bool does_string_exist_in_boot_block(char *dev, char *str);
 int find_and_mount_actual_cd(char *mountpoint);
-int find_cdrom_device(char *output, bool try_to_mount);
-int find_dvd_device(char *output, bool try_to_mount);
+char *find_cdrom_device(bool try_to_mount);
+char *find_dvd_device();
 long get_phys_size_of_drive(char *drive);
 bool is_this_a_valid_disk_format(char *format);
-int mount_CDROM_here(char *device, char *mountpoint);
+int mount_CDROM_here(char *device, const char *mountpoint);
 int find_device_in_mountlist(struct mountlist_itself *mountlist,
                              char *device);
@@ -23 +23 @@
 
 
-int find_cdrw_device(char *cdrw_device);
+char *find_cdrw_device();
 
 int interactively_obtain_media_parameters_from_user(bool);
@@ -44 +44 @@
 
 
-bool set_dev_to_this_if_rx_OK(char *output, char *dev);
+char *set_dev_to_this_if_rx_OK(char *dev);
 
 

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

@@ -693 +693 @@
 /**
  * Get the number of the last fileset in the backup.
- * @param bkpinfo The backup information structure. Only the @c bkpinfo->tmpdir field is used.
  * @return The last filelist number.
  * @note This function should only be called at restore-time.
@@ -700 +699 @@
 {
     /*@ buffers ***************************************************** */
-    char val_sz[MAX_STR_LEN];
+    char *val_sz = NULL;
     char *cfg_fname = NULL;
 
@@ -710 +709 @@
     assert(bkpinfo != NULL);
 
-    strcpy(val_sz,"");
     mr_asprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
-    read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
+    val_sz = read_cfg_var(cfg_fname, "last-filelist-number");
     mr_free(cfg_fname);
 
+    if (val_sz == NULL) {
+        mr_asprintf(val_sz, "");
+    }
     val_i = atoi(val_sz);
+    mr_free(val_sz);
+
     if (val_i <= 0) {
         val_i = 500;

branches/2.2.10/mondo/src/common/libmondo-files-EXT.h

@@ -42 +42 @@
 
 
-extern int make_hole_for_dir(char *outdir_fname);
+extern int make_hole_for_dir(const char *outdir_fname);
 
 extern long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);

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

@@ -622 +622 @@
  * @return The return value of @c mkdir.
  */
-int make_hole_for_dir(char *outdir_fname)
+int make_hole_for_dir(const char *outdir_fname)
 {
     char *tmp = NULL;
@@ -1097 +1097 @@
     char *p;
 
+    if (! bkpinfo->nfs_mount) {
+        fatal_error("No nfs_mount found !");
+    }
+
     log_it("Storing NFS configuration");
     mr_asprintf(tmp, "%s", bkpinfo->nfs_mount);

branches/2.2.10/mondo/src/common/libmondo-files.h

@@ -44 +44 @@
 
 
-int make_hole_for_dir(char *outdir_fname);
+int make_hole_for_dir(const char *outdir_fname);
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
 int make_grub_install_scriptlet(char *outfile);

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

@@ -355 +355 @@
     char *command = NULL;
     char *lockfile = NULL;
-    char tmp1[MAX_STR_LEN *2];
 
     /*@ end vars *************************************************** */

branches/2.2.10/mondo/src/common/libmondo-stream-EXT.h

@@ -5 +5 @@
 extern int closein_tape();
 extern int closeout_tape();
-extern char *mr_find_tape_device(void);
+extern char *find_tape_device_and_size(char *siz);
 extern void insist_on_this_tape_number(int tapeno);
 extern void log_tape_pos(void);

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

@@ -138 +138 @@
     paranoid_pclose(g_tape_stream);
     log_it("closein_tape() -- leaving");
-/*
-  for(i=0; i < g_tapecatalog->entries; i++)
-    {
-      log_it("i=%d type=%s num=%d aux=%ld", i, (g_tapecatalog->el[i].type==fileset)?"fileset":"bigslice", g_tapecatalog->el[i].number, g_tapecatalog->el[i].aux);
-    }
-*/
     if (!bkpinfo->please_dont_eject) {
         eject_device(bkpinfo->media_device);
@@ -222 +216 @@
                g_tapecatalog->el[i].tape_posK);
     }
-    //  if (!bkpinfo->please_dont_eject)
-    //    { eject_device(bkpinfo->media_device); }
     paranoid_free(blk);
     paranoid_free(g_tapecatalog);
@@ -261 +253 @@
     char *dev = NULL;
     int res;
+    char *dev = NULL;
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
@@ -296 +289 @@
     mr_free(command);
 
-    mr_asprintf(&dev, "%s", VANILLA_SCSI_TAPE);
-    dev[strlen(dev) - 1] = '\0';
+
+    mr_asprintf(dev, "%s", "/dev/st");
     mr_strcat(dev, tmp);            // e.g. '/dev/st0' becomes '/dev/stN'
     mr_free(tmp);
-
     res = 0;
     if (!mt_says_tape_exists(dev)) {
@@ -314 +306 @@
                 mr_asprintf(&dev, "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
+                    mr_free(dev);
                     res++;
                 } else {
@@ -322 +315 @@
     }
 
-    log_it("At this point, dev = %s and res = %d", dev, res);
+    if (dev) {
+        log_it("At this point, dev = %s and res = %d", dev, res);
+    } else {
+        log_it("At this point, dev is NULL and res = %d", dev, res);
+    }
 
     mr_asprintf(&tmp, call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
@@ -338 +335 @@
             res = 0;
         } else {
+            mr_free(dev);
             res++;
         }
@@ -610 +608 @@
     int res;
 
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
+
     if (strncmp(bkpinfo->media_device, "/dev/", 5)) {
-        log_msg(1,
-                "Not using 'mt setblk'. This isn't an actual /dev entry.");
+        log_msg(1, "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
     }
@@ -683 +684 @@
     int res = 0;
 
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
+
     log_it("Skipping OBDR headers");
     mr_asprintf(command, "mt -f %s rewind",bkpinfo->media_device);
@@ -708 +713 @@
     char *command = NULL;
     int res = 0;
+
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
 
     log_it("Creating OBDR headers");
@@ -770 +779 @@
     /*@ end vars *************************************************** */
 
-    assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
@@ -790 +796 @@
         if (bkpinfo->media_device == NULL) {
             log_it("Not able to skip OBDR - Restore will have to be done manually");
+            return (1);
         }
         set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
@@ -798 +805 @@
     make_hole_for_file(outfname);
 
-//  start_buffer_process( bkpinfo->media_device, g_tape_fifo, FALSE);
     log_it("Opening IN tape");
-    if (!
-        (g_tape_stream =
-         open_device_via_buffer(bkpinfo->media_device, 'r',
-                                bkpinfo->internal_tape_block_size))) {
+    if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'r', bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
         log_to_screen("Cannot openin stream device");
@@ -884 +887 @@
     /*@ end vars *************************************************** */
 
+    if (cddev == NULL) {
+        log_to_screen("Failed to openout NULL cddev");
+        return (1);
+    }
     /*  add 'dummy' if testing */
     mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
@@ -923 +930 @@
     return (0);
 }
-if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-    fatal_error("Cannot alloc mem for tape catalog");
-}
+if (bkpinfo->media_device == NULL) {
+    log_it("Unable to openout NULL dvice");
+    return(1);
+}
+g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
 g_tapecatalog->entries = 0;
 g_tape_posK = 0;
@@ -935 +944 @@
 }
 log_it("Opening OUT tape");
-if (!
-    (g_tape_stream =
-     open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
+if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
     log_OS_error(g_tape_fifo);
     log_to_screen("Cannot openin stream device");
@@ -950 +957 @@
 /**
  * Copy a file from the opened stream (CD or tape) to @p outfile.
- * @param bkpinfo The backup information structure. @c bkpinfo->media_device is the only field used.
  * @param outfile The file to write to.
  * @param size The size of the file in the input stream.
@@ -1422 +1428 @@
     /*@ end vars *************************************************** */
 
+    if (bkpinfo->media_device == NULL) {
+        log_it("Unable to open in from NULL device");
+        return (1);
+    }
+
     paranoid_pclose(g_tape_stream);
     sync();
@@ -1429 +1440 @@
     insist_on_this_tape_number(g_current_media_number + 1); // will increment it, too
     log_it("Opening IN the next tape");
-    if (!
-        (g_tape_stream =
-         open_device_via_buffer(bkpinfo->media_device, 'r',
-                                bkpinfo->internal_tape_block_size))) {
+    if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'r', bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
         log_to_screen("Cannot openin stream device");
@@ -1464 +1472 @@
     int res = 0;
     char *command = NULL;
+
+    if (bkpinfo->media_device == NULL) {
+        log_it("Unable to open out from NULL device");
+        return (1);
+    }
 
     paranoid_pclose(g_tape_stream);
@@ -1489 +1502 @@
     } else {
         log_it("Opening OUT to next tape");
-        if (!
-            (g_tape_stream =
-             open_device_via_buffer(bkpinfo->media_device, 'w',
-                                    bkpinfo->internal_tape_block_size))) {
+        if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
             log_OS_error(g_tape_fifo);
             log_to_screen("Cannot openin stream device");

branches/2.2.10/mondo/src/common/libmondo-stream.h

@@ -7 +7 @@
 int closein_tape();
 int closeout_tape();
-char *mr_find_tape_device(void);
+char *find_tape_device_and_size(char *siz);
 void insist_on_this_tape_number(int tapeno);
 void log_tape_pos(void);

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

@@ -10 +10 @@
                                    const char *szFunction, int nLine,
                                    const char *fmt, ...);
-extern int read_cfg_var(char *config_file, char *label, char *value);
+extern char *read_cfg_var(char *config_file, char *label);
 extern int write_cfg_var(char *config_file, char *label, char *value);
 extern void init_bkpinfo();

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

@@ -419 +419 @@
     char *p = NULL;
     char call_before_iso_user[MAX_STR_LEN] = "\0";
-    /*
-    long avm = 0;
-    int rdsiz_MB;
-    */
     char *iso_dev = NULL;
     char *iso_mnt = NULL;
@@ -449 +445 @@
     if (bkpinfo->backup_media_type == tape) {
         log_msg(1, "Bar");
+        if (bkpinfo->media_device == NULL) {
+            return(1);
+        }
         mr_asprintf(tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
@@ -526 +525 @@
             // -m isn't supported by growisofs, BTW...
         } else {
+            if (bkpinfo->media_device == NULL) {
+                return(1);
+            }
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
@@ -594 +596 @@
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
+            if (bkpinfo->media_device == NULL) {
+                return(1);
+            }
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
@@ -667 +672 @@
 
     if (bkpinfo->backup_media_type == nfs) {
-        strcpy(hostname, bkpinfo->nfs_mount);
+        if (bkpinfo->nfs_mount) {
+            strcpy(hostname, bkpinfo->nfs_mount);
+        } else {
+            log_it("nfs_mount is NULL");
+            retval++;
+            strcpy(hostname, "");
+        }
         colon = strchr(hostname, ':');
         if (!colon) {
@@ -678 +689 @@
             hent = gethostbyname(hostname);
             if (!hent) {
-                log_it("Can't resolve NFS mount (%s): %s", hostname,
-                       hstrerror(h_errno));
+                log_it("Can't resolve NFS mount (%s): %s", hostname, hstrerror(h_errno));
                 retval++;
             } else {
                 mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
                 mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
-                strcpy(bkpinfo->nfs_mount, ip_address);
-                paranoid_free(ip_address);
+                mr_free(bkpinfo->nfs_mount);
+                bkpinfo->nfs_mount = ip_address;
             }
         }
@@ -746 +756 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = bkpinfo->nfs_mount[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = '\0';
     return (res);
 }
@@ -787 +797 @@
 void mr_free_bkpinfo() {
 
+    mr_free(bkpinfo->media_device);
+    mr_free(bkpinfo->isodir);
+    mr_free(bkpinfo->prefix);
     mr_free(bkpinfo->scratchdir);
     mr_free(bkpinfo->tmpdir);
     mr_free(bkpinfo->include_paths);
     mr_free(bkpinfo->exclude_paths);
+    mr_free(bkpinfo->nfs_mount);
+    mr_free(bkpinfo->nfs_remote_dir);
     mr_free(bkpinfo->nfs_user);
 
@@ -804 +819 @@
 {
     int i;
-    char *p = NULL;
-
     log_msg(1, "Hi");
 
     /* Initialized in same order as in the structure declaration to detect errors more easily */
-    bkpinfo->media_device[0] = '\0';
+    bkpinfo->media_device = NULL;
     for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
         bkpinfo->media_size[i] = -1;
@@ -846 +859 @@
     bkpinfo->call_after_iso[0] = '\0';
     bkpinfo->kernel_path[0] = '\0';
-    bkpinfo->nfs_mount[0] = '\0';
-    bkpinfo->nfs_remote_dir[0] = '\0';
+    bkpinfo->nfs_mount = NULL;
+    bkpinfo->nfs_remote_dir = NULL;
     bkpinfo->nfs_user = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
@@ -1072 +1085 @@
  * @return 0 for success, 1 for failure.
  */
-int read_cfg_var(char *config_file, char *label, char *value)
+char *read_cfg_var(char *config_file, char *label)
 {
     /*@ buffer ****************************************************** */
     char *command = NULL;
+    char *value = NULL;
 
     /*@ end vars *************************************************** */
@@ -1083 +1097 @@
     if (!does_file_exist(config_file)) {
         log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
-        value[0] = '\0';
-        return (1);
+        return (NULL);
+        /* BERLIOS: not sure the sage of this one ?
     } else if ((value != NULL) && (strstr(value, "/dev/") && strstr(value, "t0") && !strcmp(label, "media-dev"))) {
         log_msg(2, "FYI, I can't read new value for %s - already got %s", label, value);
         return (0);
+        */
     } else {
         mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
-        strcpy(value, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(value, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
         if (strlen(value) == 0) {
-            return (1);
+            return (NULL);
         } else {
-            return (0);
+            return (value);
         }
     }

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

@@ -13 +13 @@
                             const char *szFunction, int nLine,
                             const char *fmt, ...);
-int read_cfg_var(char *config_file, char *label, char *value);
+char *read_cfg_var(char *config_file, char *label);
 int write_cfg_var(char *config_file, char *label, char *value);
 void init_bkpinfo();

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

@@ -924 +924 @@
     assert(bkpinfo != NULL);
 
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
+
     mr_asprintf(fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
@@ -1022 +1026 @@
     assert(bkpinfo != NULL);
 
+    if (bkpinfo->media_device == NULL) {
+        return(1);
+    }
+
     mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+        fatal_error("No iso filename preparation possible");
+    }
+    if (bkpinfo->nfs_remote_dir) {
+        // NFS
+        mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_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);
+    }
 
     mkdir(mountpoint, 1777);
@@ -1106 +1123 @@
         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");
         }

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

@@ -28 +28 @@
 extern void fatal_error(char *);
 extern int find_and_mount_actual_cd(char *);
-extern int find_cdrom_device(char *, bool);
+extern char *find_cdrom_device(bool);
 extern void finish(int);
 extern int get_last_filelist_number();

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

@@ -339 +339 @@
    * If backup_media_type is anything else, this should be blank.
    */
-    char media_device[MAX_STR_LEN / 4];
+    char *media_device;
 
   /**
@@ -553 +553 @@
    * address form. (Domain names will be resolved in post_param_configuration().)
    */
-    char nfs_mount[MAX_STR_LEN];
+    char *nfs_mount;
 
   /**
@@ -559 +559 @@
    * the backups in.
    */
-    char nfs_remote_dir[MAX_STR_LEN];
+    char *nfs_remote_dir;
 
   /**

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -276 +276 @@
     if (argc > 2 && !strcmp(argv[1], "find-cd")) {
         g_loglevel = 10;
-        malloc_string(tmp);
-        if (find_cdrw_device(tmp)) {
+        if ((tmp = find_cdrw_device()) == NULL) {
             printf("Failed to find CDR-RW drive\n");
         } else {
             printf("CD-RW is at %s\n", tmp);
         }
-        tmp[0] = '\0';
-        if (find_cdrom_device(tmp, atoi(argv[2]))) {
+        mr_free(tmp);
+        if ((tmp = find_cdrom_device(FALSE)) == NULL) {
             printf("Failed to find CD-ROM drive\n");
         } else {
             printf("CD-ROM is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -294 +293 @@
     if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
         g_loglevel = 10;
-        malloc_string(tmp);
-        if (find_dvd_device(tmp, atoi(argv[2]))) {
+        if ((tmp = find_dvd_device()) == NULL) {
             printf("Failed to find DVD drive\n");
         } else {
             printf("DVD is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -406 +404 @@
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
+        if (bkpinfo->media_device == NULL) {
+            fatal_error("USB device set to NULL");
+        }
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -448 +448 @@
     /** buffers **********************************************************/
     char *incoming;
-    char *tmp = NULL;
 
     /** pointers *********************************************************/
@@ -2330 +2329 @@
                                                      char *drive_name)
 {
-    /**buffers **********************************************************/
-    char *tmp = NULL;
 
     /** int *************************************************************/

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -360 +360 @@
   /**  needs malloc **********/
 
-    char *tarball_fname = NULL; 
-    char *progress_str = NULL;
-    char *tmp = NULL;
+    char *tarball_fname, *progress_str; 
+    char *tmp = NULL;
     char *mds = NULL;
     long max_val;
 
+    malloc_string(tarball_fname);
+    malloc_string(progress_str);
 
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
-
-    malloc_string(tmp);
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    tmp = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
     max_val = atol(tmp);
+    mr_free(tmp);
+
     paranoid_free(tmp);
 
@@ -442 +443 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
+    paranoid_free(tarball_fname);
+    paranoid_free(progress_str);
     return (retval);
 }
@@ -671 +674 @@
                         0, "Verifying archives against filesystem");
 
+    mr_free(bkpinfo->media_device);
     if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        strcpy(bkpinfo->media_device,
-               last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-    } else {
-        find_cdrom_device(bkpinfo->media_device, FALSE);
+        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+    } else {
+        bkpinfo->media_device = find_cdrom_device(FALSE);
     }
     res = verify_tape_backups();

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2261 +2261 @@
 /**
  * Get information about the location of ISO images from the user.
- * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters.
+ * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters. Allocted by the function
  * @param isodir_format Where to put the format (e.g. ext2) the user enters.
  * @param isodir_path Where to put the path (e.g. /var/cache/mondo) the user enters.
@@ -2267 +2267 @@
  * @return TRUE if OK was pressed, FALSE otherwise.
  */
-bool get_isodir_info(char *isodir_device, char *isodir_format, char *isodir_path, bool nuke_me_please)
-{
+bool get_isodir_info(char *isodir_device, char *isodir_format, char *isodir_path, bool nuke_me_please) {
 
     char *p = NULL;
@@ -2278 +2277 @@
     /** initialize ********************************************************/
 
-    assert(isodir_device != NULL);
     assert(isodir_path != NULL);
 
     log_it("isodir_path = %s", isodir_path);
-    if (isodir_device[0] == '\0') {
+    if (isodir_device == NULL) {
         mr_asprintf(idev, "/dev/");
     } else {
@@ -2297 +2295 @@
 
     /* modify for the caller */
-    strcpy(isodir_device, idev);
+    mr_free(isodir_device);
+    isodir_device = idev;
     if (nuke_me_please) {
         ret = TRUE;
@@ -2316 +2315 @@
     
                     /* modify for the caller */
-                    strcpy(isodir_device, p);
+                    mr_free(isodir_device);
+                    isodir_device = p;
                     mr_free(isodir_path);
                     isodir_path = r;
@@ -2327 +2327 @@
         mr_free(p);
     }
-    mr_free(idev);
     mr_free(isodir_format);
     return(ret);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -94 +94 @@
 paranoid_free(g_tmpfs_mountpt);
 */
-paranoid_free(g_isodir_device);
+mr_free(g_isodir_device);
 
 }
@@ -260 +260 @@
     char *command = NULL;
     char *mds = NULL;
-    char *p = NULL;
     int retval = 0, i;
     bool already_mounted = FALSE;
@@ -266 +265 @@
 
 g_ISO_restore_mode = TRUE;
-read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
+mr_free(g_isodir_device);
+g_isodir_device = read_cfg_var(g_mondo_cfg_file, "iso-dev");
 if (bkpinfo->disaster_recovery) {
     /* Patch Conor Daly 26-june-2004 
@@ -281 +281 @@
 }
 
+/* g_isodir_device is passed and modified in this function - memory is managed correctly in it */
 if (!get_isodir_info(g_isodir_device, isodir_format, bkpinfo->isodir, nuke_me_please)) {
     mr_free(isodir_format);
@@ -570 +571 @@
 
     char *mount_cmd = NULL;
-    char *p = NULL;
     int i, res;
 #ifdef __FreeBSD__
@@ -585 +585 @@
         log_msg(2, "mount_media() - media already mounted. Fair enough.");
         return (0);
+    }
+
+    if (bkpinfo->media_device == NULL) {
+        fatal_error("No media device at that point");
     }
 
@@ -594 +598 @@
             mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+        }
+        if ((bkpinfo->isodir == NULL) || (bkpinfo->nfs_remote_dir == NULL) || (bkpinfo->prefix == NULL)) {
+            fatal_error("Unable to prepare the iso filename");
         }
 #ifdef __FreeBSD__
@@ -624 +631 @@
 #endif
     } else {
-        if (bkpinfo->disaster_recovery
-            && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            strcpy(bkpinfo->media_device,
-                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        mr_free(bkpinfo->media_device);
+        if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+            mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
         } else {
-            find_cdrom_device(bkpinfo->media_device, TRUE);
+            bkpinfo->media_device = find_cdrom_device(TRUE);
         }
 
@@ -720 +726 @@
 t_bkptype media_specified_by_user;
 
-malloc_string(iso_mnt);
-malloc_string(iso_path);
-malloc_string(value);
 malloc_string(tmp);
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
@@ -735 +738 @@
 media_specified_by_user = bkpinfo->backup_media_type;   // or 'none', if not specified
 
-if (0 == read_cfg_var(cfg_file, "backup-media-type", value)) {
-if (!strcmp(value, "cdstream")) {
-    bkpinfo->backup_media_type = cdstream;
-} else if (!strcmp(value, "cdr")) {
-    bkpinfo->backup_media_type = cdr;
-} else if (!strcmp(value, "cdrw")) {
-    bkpinfo->backup_media_type = cdrw;
-} else if (!strcmp(value, "dvd")) {
-    bkpinfo->backup_media_type = dvd;
-} else if (!strcmp(value, "usb")) {
-    bkpinfo->backup_media_type = usb;
-    bkpinfo->please_dont_eject = TRUE;
-} else if (!strcmp(value, "iso")) {
-
-// Patch by Conor Daly - 2004/07/12
-    bkpinfo->backup_media_type = iso;
-    if (am_I_in_disaster_recovery_mode()) {
-        /* Check to see if CD is already mounted before mounting it... */
-        if (!is_this_device_mounted("/dev/cdrom")) {
-            log_msg(2,
-                    "NB: CDROM device not mounted, mounting...");
-            run_program_and_log_output("mount /dev/cdrom "
-                                       MNT_CDROM, 1);
-        }
-        if (does_file_exist(MNT_CDROM "/archives/filelist.0")) {
-            bkpinfo->backup_media_type = cdr;
-            run_program_and_log_output("umount " MNT_CDROM, 1);
-            log_it
-                ("Re-jigging configuration AGAIN. CD-R, not ISO.");
-        }
-    }
-    mr_free(bkpinfo->prefix);
-    if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(bkpinfo->prefix, "%s", value);
+if ((value = read_cfg_var(cfg_file, "backup-media-type")) == 0) {
+    if (!strcmp(value, "cdstream")) {
+        bkpinfo->backup_media_type = cdstream;
+    } else if (!strcmp(value, "cdr")) {
+        bkpinfo->backup_media_type = cdr;
+    } else if (!strcmp(value, "cdrw")) {
+        bkpinfo->backup_media_type = cdrw;
+    } else if (!strcmp(value, "dvd")) {
+        bkpinfo->backup_media_type = dvd;
+    } else if (!strcmp(value, "usb")) {
+        bkpinfo->backup_media_type = usb;
+        bkpinfo->please_dont_eject = TRUE;
+    } else if (!strcmp(value, "iso")) {
+        // Patch by Conor Daly - 2004/07/12
+        bkpinfo->backup_media_type = iso;
+        if (am_I_in_disaster_recovery_mode()) {
+            /* Check to see if CD is already mounted before mounting it... */
+            if (!is_this_device_mounted("/dev/cdrom")) {
+                log_msg(2, "NB: CDROM device not mounted, mounting...");
+                run_program_and_log_output("mount /dev/cdrom " MNT_CDROM, 1);
+            }
+            if (does_file_exist(MNT_CDROM "/archives/filelist.0")) {
+                bkpinfo->backup_media_type = cdr;
+                run_program_and_log_output("umount " MNT_CDROM, 1);
+                log_it
+                    ("Re-jigging configuration AGAIN. CD-R, not ISO.");
+            }
+        }
+        mr_free(bkpinfo->prefix);
+        mr_free(value);
+        if ((value = read_cfg_var(cfg_file, "iso-prefix")) == 0) {
+            mr_asprintf(bkpinfo->prefix, "%s", value);
+        } else {
+            mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+        }
+    } else if (!strcmp(value, "nfs")) {
+        bkpinfo->backup_media_type = nfs;
+        bkpinfo->please_dont_eject = TRUE;
+        mr_free(bkpinfo->prefix);
+        mr_free(value);
+        if ((value = read_cfg_var(cfg_file, "iso-prefix")) == 0) {
+            mr_asprintf(bkpinfo->prefix, "%s", value);
+        } else {
+            mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+        }
+    
+        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
+            /* We need to override prefix value in PXE mode as it's 
+            * already done in start-nfs */
+            envtmp1 = getenv("imgname");
+            if (envtmp1 == NULL) {
+                fatal_error("no imgname variable in environment");
+            }
+            mr_free(bkpinfo->prefix);
+            mr_asprintf(bkpinfo->prefix, "%s", envtmp1);
+        }
+
+    } else if (!strcmp(value, "tape")) {
+        bkpinfo->backup_media_type = tape;
+    } else if (!strcmp(value, "udev")) {
+        bkpinfo->backup_media_type = udev;
     } else {
-        mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
-    }
-} else if (!strcmp(value, "nfs")) {
-    bkpinfo->backup_media_type = nfs;
-    bkpinfo->please_dont_eject = TRUE;
-    mr_free(bkpinfo->prefix);
-    if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(bkpinfo->prefix, "%s", value);
-    } else {
-        mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
-    }
-
-    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
-        /* We need to override prefix value in PXE mode as it's 
-        * already done in start-nfs */
-        envtmp1 = getenv("imgname");
-        if (envtmp1 == NULL) {
-            fatal_error("no imgname variable in environment");
-        }
-        mr_free(bkpinfo->prefix);
-        mr_asprintf(bkpinfo->prefix, "%s", envtmp1);
-    }
-
-} else if (!strcmp(value, "tape")) {
-    bkpinfo->backup_media_type = tape;
-} else if (!strcmp(value, "udev")) {
-    bkpinfo->backup_media_type = udev;
+        fatal_error("UNKNOWN bkp-media-type");
+    }
 } else {
-    fatal_error("UNKNOWN bkp-media-type");
-}
-} else {
-fatal_error("backup-media-type not specified!");
-}
+    fatal_error("backup-media-type not specified!");
+}
+mr_free(value);
+
 if (bkpinfo->disaster_recovery) {
     if (bkpinfo->backup_media_type == cdstream) {
-        sprintf(bkpinfo->media_device, "/dev/cdrom");
-//          bkpinfo->media_size[0] = -1;
+        mr_free(bkpinfo->media_device);
+        mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
         bkpinfo->media_size[0] = 1999 * 1024;
         bkpinfo->media_size[1] = 650;   /* good guess */
@@ -812 +816 @@
         envtmp1 = getenv("MRUSBDEV");
         if (envtmp1 == NULL) {
-            if (read_cfg_var(cfg_file, "usb-dev", value)) {
+            if ((value = read_cfg_var(cfg_file, "usb-dev")) == NULL) {
                 fatal_error("Cannot get USB device name from cfg file");
             }
         } else {
-            strcpy(value,envtmp1);
-        }
-        sprintf(bkpinfo->media_device, "%s1", value);
+            mr_asprintf(value,"%s", envtmp1);
+        }
+        mr_free(bkpinfo->media_device);
+        mr_asprintf(bkpinfo->media_device, "%s1", value);
+        mr_free(value);
         log_msg(2, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
-    } else if (bkpinfo->backup_media_type == tape
-            || bkpinfo->backup_media_type == udev) {
-        if (read_cfg_var(cfg_file, "media-dev", value)) {
+    } else if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
+        if ((value = read_cfg_var(cfg_file, "media-dev")) == NULL) {
             fatal_error("Cannot get tape device name from cfg file");
         }
-        strcpy(bkpinfo->media_device, value);
-        read_cfg_var(cfg_file, "media-size", value);
-        bkpinfo->media_size[1] = atol(value);
+        mr_free(bkpinfo->media_device);
+        bkpinfo->media_device = value;
+
+        value = read_cfg_var(cfg_file, "media-size");
+        if (value != NULL) {
+            bkpinfo->media_size[1] = atol(value);
+            mr_free(value);
+        } else {
+            bkpinfo->media_size[1] = 0L;
+        }
         log_msg(2, "Backup medium is TAPE --- dev=%s", bkpinfo->media_device);
     } else {
-        strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
+        mr_free(bkpinfo->media_device);
+        mr_asprintf(bkpinfo->media_device, "/dev/cdrom");   /* we don't really need this var */
         bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
         bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
@@ -836 +849 @@
     }
 } else {
-    log_msg(2,
-        "Not in Disaster Recovery Mode. No need to derive device name from config file.");
-}
-
-read_cfg_var(cfg_file, "use-star", value);
-if (strstr(value, "yes")) {
+    log_msg(2, "Not in Disaster Recovery Mode. No need to derive device name from config file.");
+}
+
+value = read_cfg_var(cfg_file, "use-star");
+if (value && strstr(value, "yes")) {
     bkpinfo->use_star = TRUE;
     log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
 }
-
-read_cfg_var(cfg_file, "obdr", value);
-if (strstr(value, "TRUE")) {
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "obdr");
+if (value && strstr(value, "TRUE")) {
     bkpinfo->use_obdr = TRUE;
     log_msg(1, "OBDR mode activated");
 }
-
-read_cfg_var(cfg_file, "acl", value);
-if (strstr(value, "TRUE")) {
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "acl");
+if (value && strstr(value, "TRUE")) {
     mr_asprintf(g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
@@ -860 +874 @@
     }
 }
-read_cfg_var(cfg_file, "xattr", value);
-if (strstr(value, "TRUE")) {
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "xattr");
+if (value && strstr(value, "TRUE")) {
     mr_asprintf(g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
@@ -868 +884 @@
     }
 }
-
-if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value)) {
-bkpinfo->internal_tape_block_size = atol(value);
-log_msg(1, "Internal tape block size has been custom-set to %ld",
-        bkpinfo->internal_tape_block_size);
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "internal-tape-block-size");
+if (value != NULL) {
+    bkpinfo->internal_tape_block_size = atol(value);
 } else {
-bkpinfo->internal_tape_block_size =
-    DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-log_msg(1, "Internal tape block size = default (%ld)",
-        DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
-}
-
-read_cfg_var(cfg_file, "use-lzo", value);
-if (strstr(value, "yes")) {
-bkpinfo->use_lzo = TRUE;
-bkpinfo->use_gzip = FALSE;
-strcpy(bkpinfo->zip_exe, "lzop");
-strcpy(bkpinfo->zip_suffix, "lzo");
-} else {
-read_cfg_var(cfg_file, "use-gzip", value);
-if (strstr(value, "yes")) {
+    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
+}
+log_msg(1, "Internal tape block size set to %ld", bkpinfo->internal_tape_block_size);
+mr_free(value);
+
+bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+value = read_cfg_var(cfg_file, "use-lzo");
+if (value && strstr(value, "yes")) {
+    bkpinfo->use_lzo = TRUE;
+    bkpinfo->use_gzip = FALSE;
+    strcpy(bkpinfo->zip_exe, "lzop");
+    strcpy(bkpinfo->zip_suffix, "lzo");
+}
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "use-gzip");
+if (value && strstr(value, "yes")) {
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = TRUE;
     strcpy(bkpinfo->zip_exe, "gzip");
     strcpy(bkpinfo->zip_suffix, "gz");
+}
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "use-comp");
+if (value && strstr(value, "yes")) {
+    bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    strcpy(bkpinfo->zip_exe, "bzip2");
+    strcpy(bkpinfo->zip_suffix, "bz2");
+}
+mr_free(value);
+
+value = read_cfg_var(cfg_file, "differential");
+if (value && (!strcmp(value, "yes") || !strcmp(value, "1"))) {
+    bkpinfo->differential = TRUE;
+}
+log_msg(2, "differential var = '%s'", value);
+mr_free(value);
+if (bkpinfo->differential) {
+    log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
 } else {
-    read_cfg_var(cfg_file, "use-comp", value);
-    if (strstr(value, "yes")) {
-        bkpinfo->use_lzo = FALSE;
-        bkpinfo->use_gzip = FALSE;
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
-    } else {
-        bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
-    }
-}
-}
-
-value[0] = '\0';
-read_cfg_var(cfg_file, "differential", value);
-if (!strcmp(value, "yes") || !strcmp(value, "1")) {
-bkpinfo->differential = TRUE;
-}
-log_msg(2, "differential var = '%s'", value);
-if (bkpinfo->differential) {
-log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
-} else {
-log_msg(2, "This is a regular (full) backup");
-}
-
-read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
-if (tmp[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
+    log_msg(2, "This is a regular (full) backup");
+}
+
+tmp = read_cfg_var(g_mondo_cfg_file, "please-dont-eject");
+if (tmp || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
     log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
 }
+mr_free(tmp);
 
 if (bkpinfo->backup_media_type == nfs) {
     if (!cfgf) {
-        log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-        log_msg(2, "nfs_remote_dir remains %s",
-                bkpinfo->nfs_remote_dir);
-        log_msg(2,
-                "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
+        if (bkpinfo->nfs_mount) {
+            log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
+        }
+        if (bkpinfo->nfs_remote_dir) {
+            log_msg(2, "nfs_remote_dir remains %s", bkpinfo->nfs_remote_dir);
+        }
+        log_msg(2, "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
     } else {
-        read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
-                    bkpinfo->nfs_mount);
-        read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
-                    bkpinfo->nfs_remote_dir);
-        log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-        log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
-    }
-    if (strstr(call_program_and_get_last_line_of_output
-        ("cat /proc/cmdline"), "pxe")) {
+        mr_free(bkpinfo->nfs_mount);
+        bkpinfo->nfs_mount = read_cfg_var(g_mondo_cfg_file, "nfs-server-mount");
+
+        mr_free(bkpinfo->nfs_remote_dir);
+        bkpinfo->nfs_remote_dir = read_cfg_var(g_mondo_cfg_file, "nfs-server-path");
+
+        if (bkpinfo->nfs_mount != NULL) {
+            log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
+        }
+        if (bkpinfo->nfs_remote_dir != NULL) {
+            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+        }
+    }
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
         /* We need to override values in PXE mode as it's
         * already done in start-nfs */
@@ -951 +976 @@
             fatal_error("no dirimg variable in environment");
         }
-        strcpy(bkpinfo->nfs_mount,envtmp1);
-        strcpy(bkpinfo->nfs_remote_dir,envtmp2);
+        mr_free(bkpinfo->nfs_mount);
+        mr_asprintf(bkpinfo->nfs_mount, "%s", envtmp1);
+
+        mr_free(bkpinfo->nfs_remote_dir);
+        mr_asprintf(bkpinfo->nfs_remote_dir, "%s", envtmp2);
     }
 } else if (bkpinfo->backup_media_type == iso) {
@@ -960 +988 @@
     */
     mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
-    read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
-    read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
+    iso_mnt = read_cfg_var(g_mondo_cfg_file, "iso-mnt");
+    iso_path = read_cfg_var(g_mondo_cfg_file, "isodir");
     mr_free(bkpinfo->isodir);
     mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+    mr_free(iso_mnt);
+
     if (!bkpinfo->isodir[0]) {
         mr_free(bkpinfo->isodir);
@@ -979 +1009 @@
         }
     }
-    read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
+    mr_free(g_isodir_device);
+    g_isodir_device = read_cfg_var(g_mondo_cfg_file, "iso-dev");
     log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
 
@@ -989 +1020 @@
             log_it("command = %s", command);
             log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-            sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+            mr_asprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
         } else {
-            sprintf(iso_mnt, "/tmp/isodir");
+            mr_asprintf(iso_mnt, "/tmp/isodir");
             mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
             run_program_and_log_output(tmp1, 5);
@@ -999 +1030 @@
             mr_asprintf(tmp1, "mount %s %s", g_isodir_device, iso_mnt);
             if (run_program_and_log_output(tmp1, 3)) {
-                log_msg(1,
-                        "Unable to mount isodir. Perhaps this is really a CD backup?");
+                log_msg(1, "Unable to mount isodir. Perhaps this is really a CD backup?");
                 bkpinfo->backup_media_type = cdr;
-                strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
-                iso_mnt[0] = iso_path[0] = '\0';
+                mr_free(bkpinfo->media_device);
+                mr_asprintf(bkpinfo->media_device, "/dev/cdrom");   /* superfluous */
                 if (mount_media()) {
                     mr_free(tmp1);
@@ -1019 +1049 @@
             bkpinfo->isodir = tmp1;
         }
-    }
+        mr_free(iso_mnt);
+    }
+    mr_free(iso_path);
 }
 
@@ -1041 +1073 @@
 paranoid_free(value);
 paranoid_free(tmp);
-paranoid_free(iso_mnt);
-paranoid_free(iso_path);
 return (0);
 
@@ -1316 +1346 @@
 
   /** malloc *******/
-    char *device;
-    char *name;
+    char *device = NULL;
+    char *name = NULL;
     char *cmd = NULL;
-
-    malloc_string(device);
-    malloc_string(name);
 
     /* In order to have a working bootloader, we need to have all devices
@@ -1337 +1364 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
     backup_crucial_file(MNT_RESTORING, "/etc/mtab");
-    read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
-    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
+    device = read_cfg_var(g_mondo_cfg_file, "bootloader.device");
+    name = read_cfg_var(g_mondo_cfg_file, "bootloader.name");
     log_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
     system("sync");
@@ -1375 +1402 @@
     }
 #endif
+    mr_free(device);
+    mr_free(name);
+
     retval += res;
     if (res) {
@@ -1381 +1411 @@
         log_to_screen("Your boot loader ran OK");
     }
-    paranoid_free(device);
-    paranoid_free(name);
     return (retval);
 }
@@ -1849 +1877 @@
     malloc_string(g_mountlist_fname);
     malloc_string(g_mondo_home);
-    malloc_string(g_isodir_device);
 
     sprintf(g_biggielist_txt, "%s/%s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB);
@@ -2180 +2207 @@
             run_program_and_log_output("mkdir -p tmp", FALSE);
 
-            if (strlen(bkpinfo->media_device) == 0) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
-                log_msg(2, "media_device is blank; assuming %s");
+            if (! bkpinfo->media_device) {
+                mr_asprintf(bkpinfo->media_device, "/dev/st0");
+                log_msg(2, "media_device is blank; assuming %s", bkpinfo->media_device);
             }
             mr_asprintf(tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
+                mr_free(bkpinfo->media_device);
+                mr_asprintf(bkpinfo->media_device, "/dev/st0");
                 if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                    strcpy(bkpinfo->media_device, "/dev/osst0");
+                    mr_free(bkpinfo->media_device);
+                    mr_asprintf(bkpinfo->media_device, "/dev/osst0");
                     if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
-                        strcpy(bkpinfo->media_device, "/dev/ht0");
+                        mr_free(bkpinfo->media_device);
+                        mr_asprintf(bkpinfo->media_device, "/dev/ht0");
                         if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) {
                             log_msg(3, "I tried lots of devices but none worked.");
-                            strcpy(bkpinfo->media_device, tmp);
+                            mr_free(bkpinfo->media_device);
+                            mr_asprintf(bkpinfo->media_device, "%s", tmp);
                         }
                     }

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -969 +969 @@
         interactively_obtain_media_parameters_from_user(FALSE);
     }
-    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
-    if (!bkpinfo->media_device[0]) {
-        log_msg(2, "Warning - failed to find media dev");
+    if (!bkpinfo->media_device) {
+        log_msg(2, "WARNING: failed to find media dev");
+    } else {
+        log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     }
 
@@ -1999 +2000 @@
     long noof_biggiefiles, bigfileno = 0, total_slices;
   /** malloc **/
-    char *tmp;
     char *tmp1 = NULL;
     char *mds = NULL;
@@ -2009 +2009 @@
     FILE *fbw = NULL;
 
-    malloc_string(tmp);
     malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
@@ -2018 +2017 @@
     }
 
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-    total_slices = atol(tmp);
+    tmp1 = read_cfg_var(g_mondo_cfg_file, "total-slices");
+    total_slices = atol(tmp1);
+    mr_free(tmp1);
+
     mr_asprintf(tmp1, "Reassembling large files      ");
     mvaddstr_and_log_it(g_currentY, 0, tmp1);
@@ -2108 +2109 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
     paranoid_free(pathname_of_last_biggie_restored);
     return (retval);
@@ -2138 +2138 @@
     long max_val;
   /**malloc ***/
-    char *tmp = NULL;
     char *mds = NULL;
     char *tmp1 = NULL;
@@ -2145 +2144 @@
     char *comment;
 
-    malloc_string(tmp);
     malloc_string(comment);
 
@@ -2157 +2155 @@
     }
     insist_on_this_cd_number(g_current_media_number);
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-    max_val = atol(tmp) + 1;
-    paranoid_free(tmp);
+    tmp1 = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
+    max_val = atol(tmp1) + 1;
+    mr_free(tmp1);
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -2278 +2276 @@
 
   /** malloc add ****/
-    char *tmp;
-    char *tmp1;
+    char *tmp1 = NULL;
     char *biggie_fname;
     char *biggie_cksum;
@@ -2290 +2287 @@
     FILE *fbw = NULL;
 
-    malloc_string(tmp);
     malloc_string(biggie_fname);
     malloc_string(biggie_cksum);
@@ -2296 +2292 @@
     assert(bkpinfo != NULL);
 
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-
-    total_slices = atol(tmp);
+    tmp1 = read_cfg_var(g_mondo_cfg_file, "total-slices");
+    total_slices = atol(tmp1);
+    mr_free(tmp1);
+
     if (g_getfattr) {
         mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
@@ -2408 +2405 @@
     paranoid_free(biggie_fname);
     paranoid_free(biggie_cksum);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -2453 +2449 @@
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    tmp = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
     max_val = atol(tmp) + 1;
+    mr_free(tmp);
 
     chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
@@ -2595 +2592 @@
             openin_cdstream();
         } else {
-            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
             openin_tape();
         }
@@ -2933 +2929 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == nfs
-                && !is_this_device_mounted(bkpinfo->nfs_mount)) {
+            if (bkpinfo->backup_media_type == nfs && bkpinfo->nfs_mount && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
                 mr_free(bkpinfo->isodir);

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -62 +62 @@
 extern void setup_newt_stuff(void);
 extern void init_bkpinfo();
-extern int read_cfg_var(char *, char *, char *);
+extern char *read_cfg_var(char *, char *);
 extern int read_file_from_stream_to_file(char *,
                                          long long);