Changeset 146 in MondoRescue for trunk

Timestamp:

Dec 1, 2005, 10:00:14 AM (19 years ago)

Author:

bcornec

Message:

MONDO_LOGFILE used each time now
memory management on libmondo-devices.c
some splint improvements

Location:

trunk

Files:

• mondo/mondo/common/libmondo-devices-EXT.h (modified) (1 diff)
• mondo/mondo/common/libmondo-devices.c (modified) (104 diffs)
• mondo/mondo/common/libmondo-devices.h (modified) (1 diff)
• mondo/mondo/common/libmondo-mountlist.c (modified) (1 diff)
• mondo/mondo/common/libmondo-stream-EXT.h (modified) (1 diff)
• mondo/mondo/common/libmondo-stream.c (modified) (5 diffs)
• mondo/mondo/common/libmondo-tools.c (modified) (1 diff)
• mondo/mondo/common/my-stuff.h (modified) (2 diffs)
• mondo/mondo/common/newt-specific.c (modified) (6 diffs)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (14 diffs)
• mondo/mondo/mondorestore/mondo-prep.c (modified) (2 diffs)
• mondo/mondo/mondorestore/mondo-restore.c (modified) (1 diff)
• tools/mkrpm (modified) (1 diff)
• tools/quality (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-devices-EXT.h

@@ -47 +47 @@
 extern int eject_device(char *);
 
-extern char *list_of_NFS_devices_and_mounts();
 extern char *list_of_NFS_mounts_only(void);
 

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

@@ -19 +19 @@
 #include "libmondo-stream-EXT.h"
 
+#include <sys/ioctl.h>
 #include <sys/types.h>
 #ifdef __FreeBSD__
@@ -104 +105 @@
     bool is_this_a_ramdisk = FALSE;
 
-    malloc_string(tmp);
-    malloc_string(comment);
-    strcpy(tmp, where_is_root_mounted());
-    sprintf(comment, "root is mounted at %s\n", tmp);
+    asprintf(&tmp, where_is_root_mounted());
+    asprintf(&comment, "root is mounted at %s\n", tmp);
     log_msg(0, comment);
+    paranoid_free(comment);
+
     log_msg(0,
             "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
@@ -127 +128 @@
     }
 #endif
+    paranoid_free(tmp);
 
     if (is_this_a_ramdisk) {
@@ -139 +141 @@
         is_this_a_ramdisk = TRUE;
     }
-    paranoid_free(tmp);
-    paranoid_free(comment);
     log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
 }
-
-
-
 
 
@@ -157 +154 @@
 static char *bkptype_to_string(t_bkptype bt)
 {
-    static char output[MAX_STR_LEN / 4];
+    static char *output = NULL;
+
+    paranoid_free(output);
+
     switch (bt) {
     case none:
-        strcpy(output, "none");
+        asprintf(&output, "none");
         break;
     case iso:
-        strcpy(output, "iso");
+        asprintf(&output, "iso");
         break;
     case cdr:
-        strcpy(output, "cdr");
+        asprintf(&output, "cdr");
         break;
     case cdrw:
-        strcpy(output, "cdrw");
+        asprintf(&output, "cdrw");
         break;
     case cdstream:
-        strcpy(output, "cdstream");
+        asprintf(&output, "cdstream");
         break;
     case nfs:
-        strcpy(output, "nfs");
+        asprintf(&output, "nfs");
         break;
     case tape:
-        strcpy(output, "tape");
+        asprintf(&output, "tape");
         break;
     case udev:
-        strcpy(output, "udev");
+        asprintf(&output, "udev");
         break;
     default:
-        strcpy(output, "default");
-    }
-    return (output);
-}
-
+        asprintf(&output, "default");
+    }
+    return (&output);
+}
 
 
@@ -205 +204 @@
     int res1 = 0, res2 = 0;
 
-    malloc_string(command);
-
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        sprintf(command, "mt -f %s offline", dev);
+        asprintf(&command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
+        paranoid_free(command);
     } else {
         res1 = 0;
@@ -217 +215 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        sprintf(command, "cdcontrol -f %s eject", dev);
-    } else {
-        sprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
+        asprintf(&command, "cdcontrol -f %s eject", dev);
+    } else {
+        asprintf(&command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    sprintf(command, "eject %s", dev);
+    asprintf(&command, "eject %s", dev);
 #endif
 
@@ -236 +234 @@
 }
 
+
 /**
  * Load (inject) the tray of the specified CD device.
@@ -246 +245 @@
     int i;
 
-    malloc_string(command);
-
-
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        sprintf(command, "cdcontrol -f %s close", dev);
-    } else {
-        sprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`",
+        asprintf(&command, "cdcontrol -f %s close", dev);
+    } else {
+        asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    sprintf(command, "eject -t %s", dev);
+    asprintf(&command, "eject -t %s", dev);
 #endif
     i = run_program_and_log_output(command, FALSE);
@@ -275 +271 @@
     /*@ buffers *********************************************************** */
     char *tmp;
-
-    malloc_string(tmp);
+    bool ret;
+
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    sprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
-
+    asprintf(&tmp, "ls %s > /dev/null 2> /dev/null", device);
+
+    if (system(tmp)) {
+        ret = FALSE;
+    } else {
+        ret = TRUE;
+    }
     paranoid_free(tmp);
-    if (system(tmp)) {
-        return (FALSE);
-    } else {
-        return (TRUE);
-    }
+    return(ret);
 }
 
@@ -317 +314 @@
     /*@ buffers **************************************************** */
     char *program;
-    char *incoming;
+    char *incoming = NULL;
     char *searchstr;
-    char *tmp;
 
     /*@ ints ******************************************************* */
     int res = 0;
+    int n = 0;
 
     /*@ pointers *************************************************** */
@@ -332 +329 @@
     assert(partno >= 0 && partno < 999);
 
-    malloc_string(program);
-    malloc_string(incoming);
     malloc_string(searchstr);
-    malloc_string(tmp);
 
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    sprintf(program, "ls %s >/dev/null 2>&1", drive,
-            build_partition_name(tmp, drive, partno));
-    return system(program);
-#else
-    tmp[0] = '\0';
-#endif
-
-    sprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
+    asprintf(&program, "ls %s >/dev/null 2>&1", drive);
+    res = system(program);
+    paranoid_free(program);
+    return(res);
+#endif
+
+    asprintf(&program, "parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
         log_it("program=%s", program);
         log_OS_error("Cannot popen-in program");
+        paranoid_free(program);
         return (0);
     }
+    paranoid_free(program);
+
     (void) build_partition_name(searchstr, drive, partno);
     strcat(searchstr, " ");
-    for (res = 0; !res && fgets(incoming, MAX_STR_LEN - 1, fin);) {
+    for (res = 0; !res && getline(&incoming, &n, fin);) {
         if (strstr(incoming, searchstr)) {
             res = 1;
         }
     }
+    paranoid_free(incoming);
+
     if (pclose(fin)) {
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(program);
-    paranoid_free(incoming);
     paranoid_free(searchstr);
-    paranoid_free(tmp);
     return (res);
 }
-
-
-
 
 
@@ -386 +378 @@
 
     /*@ end vars *************************************************** */
-    int i;
+    int ret;
 
     assert_string_is_neither_NULL_nor_zerolength(dev);
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    malloc_string(command);
-    sprintf(command,
+    asprintf(&command,
             "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
             dev, str);
-    i = system(command);
+    ret = system(command);
     paranoid_free(command);
-    if (i) {
+    if (ret) {
         return (FALSE);
     } else {
@@ -403 +394 @@
     }
 }
+
 
 /**
@@ -416 +408 @@
     char *command;
     /*@ end vars *************************************************** */
-    int i;
-
-    malloc_string(command);
-    sprintf(command,
+    int ret;
+
+    asprintf(&command,
             "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
             dev, n, str);
-    i = system(command);
+    ret = system(command);
     paranoid_free(command);
-    if (i) {
+
+    if (ret) {
         return (FALSE);
     } else {
@@ -430 +422 @@
     }
 }
-
 
 
@@ -490 +481 @@
 
 
-
-
-
-/**
- * Locate a CD-R/W writer's SCSI node.
- * @param cdrw_device SCSI node will be placed here.
- * @return 0 for success, nonzero for failure.
- */
-
-
 /**
  * Locate a CD-R/W writer's SCSI node.
@@ -513 +494 @@
     char *command;
 
-    malloc_string(comment);
-    malloc_string(tmp);
-    malloc_string(cdr_exe);
-    malloc_string(command);
     if (g_cdrw_drive_is_here[0]) {
         strcpy(cdrw_device, g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
         return (0);
     }
@@ -529 +502 @@
         log_msg(1,
                 "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
         return (1);
     }
     run_program_and_log_output("insmod ide-scsi", -1);
     if (find_home_of_exe("cdrecord")) {
-        strcpy(cdr_exe, "cdrecord");
-    } else {
-        strcpy(cdr_exe, "dvdrecord");
-    }
-    tmp[0] = '\0';
+        asprintf(&cdr_exe, "cdrecord");
+    } else {
+        asprintf(&cdr_exe, "dvdrecord");
+    }
     if (find_home_of_exe(cdr_exe)) {
-        sprintf(command,
+        asprintf(&command,
                 "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
                 cdr_exe);
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    }
+        asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+        paranoid_free(command);
+    } else {
+        asprintf(&tmp, "");
+    }
+    paranoid_free(cdr_exe);
+
     if (strlen(tmp) < 2) {
+        paranoid_free(tmp);
+        return 1;
+    } else {
+        strcpy(cdrw_device, tmp);
+        paranoid_free(tmp);
+
+        asprintf(&comment, "Found CDRW device - %s", cdrw_device);
+        log_it(comment);
         paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
-        return 1;
-    } else {
-        strcpy(cdrw_device, tmp);
-        sprintf(comment, "Found CDRW device - %s", cdrw_device);
-        log_it(comment);
+
         strcpy(g_cdrw_drive_is_here, cdrw_device);
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
         return (0);
     }
 }
-
-
 
 
@@ -586 +554 @@
     char *q;
     char *r;
+    int n = 0;
     int retval = 0;
 
@@ -592 +561 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *cdr_exe;
-    char *phrase_one;
-    char *phrase_two;
+#ifndef __FreeBSD__
+    char *phrase_two = NULL;
+    char *dvd_last_resort = NULL;
+#endif
     char *command;
-    char *dvd_last_resort;
     char *mountpoint;
     static char the_last_place_i_found_it[MAX_STR_LEN] = "";
 
     /*@ intialize *************************************************** */
-    malloc_string(tmp);
-    malloc_string(cdr_exe);
-    malloc_string(phrase_one);
-    malloc_string(phrase_two);
-    malloc_string(command);
-    malloc_string(dvd_last_resort);
-    malloc_string(mountpoint);
 
     output[0] = '\0';
-    phrase_one[0] = '\0';
-    phrase_two[0] = '\0';
-    dvd_last_resort[0] = '\0';
 
     /*@ end vars **************************************************** */
@@ -620 +580 @@
         strcpy(output, g_cdrom_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
+        return(0);
     }
     if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
@@ -628 +587 @@
                 "find_cdrom_device() --- returning last found location - '%s'",
                 output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
-    }
-
-    sprintf(mountpoint, "/tmp/cd.%d", (int) (random() % 32767));
-    make_hole_for_dir(mountpoint);
+        return(0);
+    }
 
     if (find_home_of_exe("cdrecord")) {
-        strcpy(cdr_exe, "cdrecord");
-    } else {
-        strcpy(cdr_exe, "dvdrecord");
-    }
-    tmp[0] = '\0';
+        asprintf(&cdr_exe, "cdrecord");
+    } else {
+        asprintf(&cdr_exe, "dvdrecord");
+    }
     if (!find_home_of_exe(cdr_exe)) {
         strcpy(output, "/dev/cdrom");
@@ -646 +600 @@
         if (!does_device_exist(output)) {
             log_msg(4, "That didn't work. Sorry.");
-            retval = 1;
-            goto end_of_find_cdrom_device;
+            paranoid_free(cdr_exe);
+            return(1);
         } else {
-            retval = 0;
-            goto end_of_find_cdrom_device;
-        }
-    }
-
-    sprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
+            paranoid_free(cdr_exe);
+            return(0);
+        }
+    }
+
+    asprintf(&command, "%s -scanbus 2> /dev/null", cdr_exe);
     fin = popen(command, "r");
     if (!fin) {
         log_msg(4, "command=%s", command);
         log_OS_error("Cannot popen command");
+        paranoid_free(cdr_exe);
+        paranoid_free(command);
         return (1);
     }
-    for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         fgets(tmp, MAX_STR_LEN, fin)) {
+    paranoid_free(command);
+
+    for (getline(&tmp, &n, fin); !feof(fin);
+         getline(&tmp, &n, fin)) {
         p = strchr(tmp, '\'');
         if (p) {
@@ -669 +627 @@
                 for (r = q; *(r - 1) == ' '; r--);
                 *r = '\0';
-                strcpy(phrase_one, p);
                 p = strchr(++q, '\'');
                 if (p) {
@@ -678 +635 @@
                         }
                         *q = '\0';
-                        strcpy(phrase_two, p);
+#ifndef __FreeBSD__
+                        paranoid_free(phrase_two);
+                        asprintf(&phrase_two, p);
+#endif
                     }
                 }
@@ -685 +645 @@
     }
     paranoid_pclose(fin);
+    paranoid_free(tmp);
+    tmp = NULL;
+    n = 0;
 
 #ifndef __FreeBSD__
@@ -690 +653 @@
         log_msg(4, "Not running phase two. String is empty.");
     } else {
-        sprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
+        asprintf(&command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
         if (!fin) {
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
-            for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-                 fgets(tmp, MAX_STR_LEN, fin)) {
+            for (getline(&tmp, &n, fin); !feof(fin);
+                 getline(&tmp, &n, fin)) {
                 log_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
@@ -703 +666 @@
                         *p = '\0';
                         if (strstr(tmp, "DVD")) {
-                            sprintf(dvd_last_resort, "/dev/%s", tmp);
+                            paranoid_free(dvd_last_resort);
+                            asprintf(&dvd_last_resort, "/dev/%s", tmp);
                             log_msg(4,
                                     "Ignoring '%s' because it's a DVD drive",
@@ -714 +678 @@
                 }
             }
+            paranoid_free(tmp);
             paranoid_pclose(fin);
         }
-    }
+        paranoid_free(command);
+    }
+    paranoid_free(phrase_two);
 
 #endif
@@ -745 +712 @@
                                                               "/dev/cd1")))
                                 {
-                                    retval = 1;
-                                    goto end_of_find_cdrom_device;
+                                    paranoid_free(cdr_exe);
+                                    return(1);
                                 }
                             }
@@ -756 +723 @@
     }
 #else
-    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);
-        found_it = TRUE;
-    }
+    if (dvd_last_resort != NULL) {
+        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);
+            found_it = TRUE;
+        }
+    }
+    paranoid_free(dvd_last_resort);
+
     if (found_it) {
-        sprintf(tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
+        asprintf(&tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
                 strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
@@ -772 +743 @@
             output[0] = '\0';
         }
+        paranoid_free(tmp);
     }
 
@@ -811 +783 @@
                                                                   g_cdrw_drive_is_here)))
                                     {
-                                        retval = 1;
-                                        goto end_of_find_cdrom_device;
+                                        paranoid_free(cdr_exe);
+                                        return(1);
                                     }
                                 }
@@ -824 +796 @@
 #endif
 
+    asprintf(&mountpoint, "/tmp/cd.%d", (int) (random() % 32767));
+    make_hole_for_dir(mountpoint);
+
     if (found_it && try_to_mount) {
         if (mount_CDROM_here(output, mountpoint)) {
@@ -829 +804 @@
             found_it = FALSE;
         } else {
-            sprintf(tmp, "%s/archives", mountpoint);
+            asprintf(&tmp, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
                 log_msg(4, "[Cardigans] I'll take it back");
                 found_it = FALSE;
             } else {
-                sprintf(command, "umount %s", output);
+                asprintf(&command, "umount %s", output);
                 paranoid_system(command);
+                paranoid_free(command);
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
+            paranoid_free(tmp);
         }
     }
     unlink(mountpoint);
+    paranoid_free(mountpoint);
 
     if (found_it) {
@@ -850 +828 @@
         strcpy(the_last_place_i_found_it, output);
         strcpy(g_cdrom_drive_is_here, output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
-    }
-
-    sprintf(command,
+        return(0);
+    }
+
+    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);
     log_msg(1, "command=%s", command);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    paranoid_free(command);
+
     if (tmp[0]) {
         strcpy(output, tmp);
         log_msg(4, "Finally found it at %s", output);
         retval = 0;
-        goto end_of_find_cdrom_device;
     } else {
         log_msg(4, "Still couldn't find it.");
         retval = 1;
-        goto end_of_find_cdrom_device;
-    }
-  end_of_find_cdrom_device:
+    }
     paranoid_free(tmp);
     paranoid_free(cdr_exe);
-    paranoid_free(phrase_one);
-    paranoid_free(phrase_two);
-    paranoid_free(command);
-    paranoid_free(dvd_last_resort);
-    paranoid_free(mountpoint);
     return (retval);
 }
 
 
-
-
-
 int find_dvd_device(char *output, bool try_to_mount)
 {
-    char *command;
     char *tmp;
     int retval = 0, devno = -1;
-
-    malloc_string(command);
-    malloc_string(tmp);
 
     if (g_dvd_drive_is_here[0]) {
@@ -899 +863 @@
     }
 
-    sprintf(tmp, call_program_and_get_last_line_of_output
+    asprintf(&tmp, 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])
-        sprintf(tmp, call_program_and_get_last_line_of_output
+    if (!tmp[0]) {
+        paranoid_free(tmp);
+        asprintf(&tmp, call_program_and_get_last_line_of_output
                 ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
             );
+    }
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
     }
+    paranoid_free(tmp);
+
     if (devno >= 0) {
         retval = 0;
@@ -926 +894 @@
 }
 
-
-
-
-
-#include <sys/ioctl.h>
 
 /**
@@ -1015 +978 @@
         log_msg(1, "Failed to get harddisk geometry, using old mode");
     }
-/*  
-  if ((fd = open (drive, O_RDONLY)) != -1) {
-      if (ioctl (fd, HDIO_GETGEO, &hdgeo) != -1)  {
-      close (fd);
-      log_msg (2, "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB", drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors, (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
-      if ( hdgeo.cylinders && hdgeo.heads && hdgeo.sectors ) {
-          outvalB = ((long) (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
-      }
-      }
-      close (fd);
- */
 #endif
 
@@ -1041 +993 @@
 }
 
-/* The old version */
-#if 0
-long get_phys_size_of_drive(char *drive)
-{
-    /*@ pointers **************************************************** */
-#if linux
-    FILE *fin;
-    char *p;
-    char *q;
-    char *r;
-    /*@ buffers ***************************************************** */
-    char *tmp;
-    char *command;
-
-    /*@ long ******************************************************** */
-    long outL;
-    long tempLa;
-    long tempLb;
-    long tempLc;
-
-#endif
-
-    struct hd_geometry hdgeo;
-    int fd;
-
-#ifdef __FreeBSD__
-    off_t o;
-
-    if ((fd = open(drive, O_RDONLY)) != -1) {
-        if (ioctl(fd, DIOCGMEDIASIZE, &o) != -1) {
-            close(fd);
-            return (long) (o / (off_t) (1024 * 1024));
-        }
-        close(fd);
-    }
-    log_msg(4, "drive = %s, error = %s", drive, strerror(errno));
-    fatal_error("GPSOD: Unable to get size of drive");
-#else
-
-    malloc_string(tmp);
-    malloc_string(command);
-
-    if ((fd = open(drive, O_RDONLY)) != -1) {
-        if (ioctl(fd, HDIO_GETGEO, &hdgeo) != -1) {
-            close(fd);
-            log_msg(2,
-                    "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB",
-                    drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors,
-                    (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 /
-                     1024));
-            if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                return ((long)
-                        (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors /
-                         2 / 1024));
-            }
-        }
-        close(fd);
-    }
-
-    assert_string_is_neither_NULL_nor_zerolength(drive);
-
-    sprintf(command,
-            "parted2fdisk -l %s | head -n4 | tr -s '\n' '\t' | tr -s ' ' '\t' | cut -f8,14,16",
-            drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (tmp[0]) {
-        p = tmp;
-        q = strchr(p, ' ');
-        if (q) {
-            *(q++) = '\0';
-            r = strchr(q, ' ');
-            if (r) {
-                *(r++) = '\0';
-                tempLa = atol(p);
-                tempLb = atol(q);
-                tempLc = atol(r);
-                outL = tempLa * tempLb / 1024 * tempLc / 1024;
-                if (outL > 100) {
-                    paranoid_free(tmp);
-                    paranoid_free(command);
-                    return (outL);
-                }
-            }
-        }
-    }
-
-    /* try to grep for 'Drive xxxx: yyy MB' */
-    sprintf(command,
-            "parted2fdisk -l %s | grep MB | tr -s ' ' '\t' | cut -f3",
-            drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    if (atol(tmp) > 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (atol(tmp));
-    }
-
-    /* else, do it the old-fashioned way */
-    p = strrchr(drive, (int) '/');
-    if (p) {
-        strcpy(tmp, p + 1);
-    } else {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    sprintf(command, "dmesg | grep %s 2> /dev/null", tmp);
-    if (!(fin = popen(command, "r"))) {
-        log_OS_error("Cannot popen dmesg command");
-    } else {
-        fgets(tmp, MAX_STR_LEN - 1, fin);
-        while (!feof(fin) && !strstr(tmp, "GB") && !strstr(tmp, "MB")) {
-            fgets(tmp, MAX_STR_LEN - 1, fin);
-        }
-        if (pclose(fin)) {
-            log_OS_error("Cannot pclose dmesg fin");
-        }
-    }
-    if (!(p = strstr(tmp, "GB")) && !(p = strstr(tmp, "MB"))) {
-        log_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
-                drive);
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    for (; !isdigit(*(p - 1)); p--);
-    *p = '\0';
-    for (p--; isdigit(*(p - 1)); p--);
-    outL = atol(p);
-    if (outL <= 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
-        return (-1);
-    }
-    if (strstr(tmp, "GB")) {
-        outL = outL * 1024;
-    }
-    paranoid_free(tmp);
-    paranoid_free(command);
-    return (outL * 19 / 20);
-#endif
-}
-#endif                          /* 0 */
-
-
-
-
 
 /**
@@ -1202 +1007 @@
 
     FILE *pin;
-    int retval;
+    bool retval;
     malloc_string(good_formats);
-    malloc_string(command);
-    malloc_string(format_sz);
-
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    sprintf(format_sz, "%s ", format);
+    asprintf(&format_sz, "%s ", format);
 
 #ifdef __FreeBSD__
-    sprintf(command,
+    asprintf(&command,
             "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    sprintf(command,
+    asprintf(&command,
             "cat /proc/filesystems | grep -v nodev | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
     pin = popen(command, "r");
+    paranoid_free(command);
+
     if (!pin) {
         log_OS_error("Unable to read good formats");
-        retval = 0;
+        retval = FALSE;
     } else {
         strcpy(good_formats, " ");
@@ -1232 +1036 @@
         strcat(good_formats, " swap lvm raid ntfs 7 "); // " ntfs 7 " -- um, cheating much? :)
         if (strstr(good_formats, format_sz)) {
-            retval = 1;
+            retval = TRUE;
         } else {
-            retval = 0;
+            retval = FALSE;
         }
     }
     paranoid_free(good_formats);
-    paranoid_free(command);
     paranoid_free(format_sz);
     return (retval);
@@ -1258 +1061 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming;
+    char *incoming = NULL;
     char *device_with_tab;
     char *device_with_space;
     char *tmp;
-    int retval = 0;
+    int n = 0;
 
 #ifdef __FreeBSD__
@@ -1272 +1075 @@
     /*@ end vars **************************************************** */
 
-    malloc_string(incoming);
-    malloc_string(device_with_tab);
-    malloc_string(device_with_space);
-    malloc_string(tmp);
     assert(device_raw != NULL);
 //  assert_string_is_neither_NULL_nor_zerolength(device_raw);
@@ -1281 +1080 @@
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
-        sprintf(tmp, "/%s", device_raw);
-    } else {
-        strcpy(tmp, device_raw);
+        asprintf(&tmp, "/%s", device_raw);
+    } else {
+        asprintf(&tmp, device_raw);
     }
     log_msg(1, "Is %s mounted?", tmp);
@@ -1289 +1088 @@
         log_msg(1,
                 "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
-        return (0);
-    }
-    sprintf(device_with_tab, "%s\t", tmp);
-    sprintf(device_with_space, "%s ", tmp);
+        return (FALSE);
+    }
+    asprintf(&device_with_tab, "%s\t", tmp);
+    asprintf(&device_with_space, "%s ", tmp);
+    paranoid_free(tmp);
 
     if (!(fin = popen("mount", "r"))) {
@@ -1298 +1098 @@
         return (FALSE);
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (getline(&incoming, &n, fin); !feof(fin);
+         getline(&incoming, &n, fin)) {
         if (strstr(incoming, device_with_space) //> incoming
             || strstr(incoming, device_with_tab))   // > incoming)
         {
             paranoid_pclose(fin);
-            retval = 1;
-            goto end_of_func;
-        }
-    }
+            return(TRUE);
+        }
+    }
+    paranoid_free(incoming);
+    paranoid_free(device_with_tab);
     paranoid_pclose(fin);
-    sprintf(tmp, "%s | grep -w \"%s\" > /dev/null 2> /dev/null",
+
+    asprintf(&tmp, "%s | grep -w \"%s\" > /dev/null 2> /dev/null",
             SWAPLIST_COMMAND, device_with_space);
+    paranoid_free(device_with_space);
+
     log_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
-        retval = 1;
-        goto end_of_func;
-    }
-  end_of_func:
-    paranoid_free(incoming);
-    paranoid_free(device_with_tab);
-    paranoid_free(device_with_space);
+        paranoid_free(tmp);
+        return(TRUE);
+    }
     paranoid_free(tmp);
-    return (retval);
-}
+    return (FALSE);
+}
+
 
 #ifdef __FreeBSD__
@@ -1329 +1130 @@
  * Create a loopback device for specified @p fname.
  * @param fname The file to associate with a device.
- * @return /dev entry for the device, or NULL if it couldn't be allocated.
+ * @return /dev entry for the device (to be freed by the caller), 
+ * or NULL if it couldn't be allocated.
  */
 char *make_vn(char *fname)
 {
-    char *device = (char *) malloc(MAX_STR_LEN);
-    char *mddevice = (char *) malloc(32);
-    char command[MAX_STR_LEN];
+    char *device;
+    char *mddevice = NULL;
+    char *command = NULL;
     int vndev = 2;
+
     if (atoi
         (call_program_and_get_last_line_of_output
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
         do {
-            sprintf(mddevice, "vn%ic", vndev++);
-            sprintf(command, "vnconfig %s %s", mddevice, fname);
+            paranoid_free(mddevice);
+            asprintf(&mddevice, "vn%ic", vndev++);
+
+            paranoid_free(command);
+            asprintf(&command, "vnconfig %s %s", mddevice, fname);
+
             if (vndev > 10) {
+                paranoid_free(command);
+                paranoid_free(mddevice);
                 return NULL;
             }
         }
         while (system(command));
-    } else {
-        sprintf(command, "mdconfig -a -t vnode -f %s", fname);
-        mddevice = call_program_and_get_last_line_of_output(command);
+        paranoid_free(command);
+    } else {
+        asprintf(&command, "mdconfig -a -t vnode -f %s", fname);
+        asprintf(&mddevice, call_program_and_get_last_line_of_output(command));
+        paranoid_free(command);
+
         if (!strstr(mddevice, "md")) {
+            paranoid_free(mddevice);
             return NULL;
         }
     }
-    sprintf(device, "/dev/%s", mddevice);
-    return device;
-}
-
+    asprintf(&device, "/dev/%s", mddevice);
+    paranoid_free(mddevice);
+    return(device);
+}
 
 
@@ -1371 +1184 @@
 int kick_vn(char *dname)
 {
-    char command[MAX_STR_LEN];
+    char *command;
+    int ret = 0;
 
     if (strncmp(dname, "/dev/", 5) == 0) {
@@ -1380 +1194 @@
         (call_program_and_get_last_line_of_output
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
-        sprintf(command, "vnconfig -d %s", dname);
-        return system(command);
-    } else {
-        sprintf(command, "mdconfig -d -u %s", dname);
-        return system(command);
+        asprintf(&command, "vnconfig -d %s", dname);
+        ret = system(command);
+        paranoid_free(command);
+        return(ret);
+    } else {
+        asprintf(&command, "mdconfig -d -u %s", dname);
+        ret = system(command);
+        paranoid_free(command);
+        return(ret);
     }
      /*NOTREACHED*/ return 255;
@@ -1401 +1219 @@
     /*@ buffer ****************************************************** */
     char *command;
-    char *dev;
-    char *options;
     int retval;
 
-    malloc_string(command);
-    malloc_string(dev);
-    malloc_string(options);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
     make_hole_for_dir(mountpoint);
-    strcpy(options, "ro");
     if (isdigit(device[0])) {
         find_cdrom_device(device, FALSE);
-    } else {
-        strcpy(dev, device);
     }
     if (g_ISO_restore_mode) {
 
 #ifdef __FreeBSD__
-        strcpy(dev, make_vn(device));
+        char *dev;
+
+        dev = make_vn(device));
         if (!dev) {
-            sprintf(command, "Unable to mount ISO (make_vn(%s) failed)",
+            asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)",
                     device);
             fatal_error(command);
         }
         strcpy(device, dev);
-#else
-        strcat(options, ",loop");
-#endif
-
-    }
+        paranoid_free(dev);
+#endif
+    }
+
     log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
             mountpoint);
@@ -1438 +1249 @@
 
 #ifdef __FreeBSD__
-    sprintf(command, "mount_cd9660 -r %s %s 2>> %s",
+    asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
             device, mountpoint, MONDO_LOGFILE);
-
 #else
-    sprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s",
-            device, options, mountpoint, MONDO_LOGFILE);
+    asprintf(&command, "mount %s -o ro,loop -t iso9660 %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
 #endif
 
@@ -1452 +1262 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-
     paranoid_free(command);
-    paranoid_free(dev);
-    paranoid_free(options);
+
     return (retval);
 }
-
-
-
-
 
 
@@ -1497 +1301 @@
         return;
     }
-    malloc_string(tmp);
-    malloc_string(request);
-    sprintf(tmp, "mkdir -p " MNT_CDROM);
+
+    asprintf(&tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
+    paranoid_free(tmp);
+
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
         || bkpinfo->backup_media_type == nfs) {
@@ -1511 +1316 @@
         }
         system("mkdir -p /tmp/isodir &> /dev/null");
-        sprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
+        asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                 cd_number_i_want);
         if (!does_file_exist(tmp)) {
-            sprintf(tmp, "/tmp/isodir/%s/%s-%d.iso",
+            paranoid_free(tmp);
+            asprintf(&tmp, "/tmp/isodir/%s/%s-%d.iso",
                     bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                     cd_number_i_want);
@@ -1529 +1335 @@
             fatal_error("Mommy!");
         }
-//    g_current_media_number = cd_number_i_want;
-//    return;
+        paranoid_free(tmp);
     }
     if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
-        sprintf(tmp, "Insisting on %s #%d",
+        asprintf(&tmp, "Insisting on %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 cd_number_i_want);
-        sprintf(request, "Please insert %s #%d and press Enter.",
+        asprintf(&request, "Please insert %s #%d and press Enter.",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 cd_number_i_want);
         log_msg(3, tmp);
+        paranoid_free(tmp);
+
         while (what_number_cd_is_this(bkpinfo) != cd_number_i_want) {
             paranoid_system("sync");
@@ -1567 +1374 @@
             paranoid_system("sync");
         }
+        paranoid_free(request);
+
         log_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
-    paranoid_free(tmp);
-    paranoid_free(request);
-}
-
+}
 /* @} - end of deviceGroup */
-
-
-
-
 
 
@@ -1598 +1400 @@
 {
     char *tmp;
-    char *sz_size;
+    char *sz_size = NULL;
     char *command;
     char *comment;
-    char *prompt;
+    char *prompt = NULL;
     int i;
     FILE *fin;
 
-    malloc_string(tmp);
-    malloc_string(sz_size);
-    malloc_string(command);
-    malloc_string(comment);
     assert(bkpinfo != NULL);
-    sz_size[0] = '\0';
     bkpinfo->nonbootable_backup = FALSE;
 
@@ -1667 +1464 @@
                 finish(1);
             }
-            sprintf(comment, "What speed is your %s (re)writer?",
+            asprintf(&comment, "What speed is your %s (re)writer?",
                     media_descriptor_string(bkpinfo->backup_media_type));
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
-                strcpy(tmp, "1");
-                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+                asprintf(&tmp, "1");
+                asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
-                strcpy(tmp, "4");
-                strcpy(sz_size, "650");
+                asprintf(&tmp, "4");
+                asprintf(&sz_size, "650");
                 log_msg(1, "Setting to CD defaults");
             }
@@ -1686 +1483 @@
                 }
             }
+            paranoid_free(comment);
+
             bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
-            sprintf(comment,
+            paranoid_free(tmp);
+
+            asprintf(&comment,
                     "How much data (in Megabytes) will each %s store?",
                     media_descriptor_string(bkpinfo->backup_media_type));
+
             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            paranoid_free(comment);
+
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
                 bkpinfo->media_size[i] = atoi(sz_size);
@@ -1701 +1505 @@
                 finish(1);
             }
+            paranoid_free(sz_size);
         }
     case cdstream:
@@ -1718 +1523 @@
                 log_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
-                sprintf(comment,
+                asprintf(&comment,
                         "Please specify your %s drive's /dev entry",
                         media_descriptor_string(bkpinfo->
@@ -1728 +1533 @@
                     finish(1);
                 }
+                paranoid_free(comment);
             }
             log_msg(2, "%s device found at %s",
@@ -1737 +1543 @@
             }
             if (bkpinfo->media_device[0]) {
-                sprintf(tmp,
+                asprintf(&tmp,
                         "I think I've found your %s burner at SCSI node %s; am I right on the money?",
                         media_descriptor_string(bkpinfo->
@@ -1745 +1551 @@
                     bkpinfo->media_device[0] = '\0';
                 }
+                paranoid_free(tmp);
             }
             if (!bkpinfo->media_device[0]) {
@@ -1796 +1603 @@
                 }
             }
-            sprintf(tmp,
-                    "I think I've found your tape streamer at %s; am I right on the money?",
-                    bkpinfo->media_device);
-        }
-        if (bkpinfo->media_device[0]) {
-            sprintf(tmp,
+            asprintf(&tmp,
                     "I think I've found your tape streamer at %s; am I right on the money?",
                     bkpinfo->media_device);
@@ -1807 +1609 @@
                 bkpinfo->media_device[0] = '\0';
             }
+            paranoid_free(tmp);
         }
         if (!bkpinfo->media_device[0]) {
@@ -1817 +1620 @@
             }
         }
-        sprintf(tmp, "ls -l %s", bkpinfo->media_device);
+        asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
         if (run_program_and_log_output(tmp, FALSE)) {
             log_to_screen("User has not specified a valid /dev entry");
             finish(1);
         }
+        paranoid_free(tmp);
         log_msg(4, "sz_size = %s", sz_size);
         sz_size[0] = '\0';
-/*
-    if ((size_sz[0]=='\0' || atol(size_sz)==0) && archiving_to_media)
-      {
-        if (!popup_and_get_string("Tape size", "How much COMPRESSED data will one of your tape cartridges hold? (e.g. 4GB for 4 gigabytes)", size_sz, 16))
-          { log_to_screen("User has chosen not to backup the PC"); finish(1); }
-      }
-*/
-        if (sz_size[0] == '\0') {
-            bkpinfo->media_size[0] = 0;
-        } else {
-            bkpinfo->media_size[0] =
-                friendly_sizestr_to_sizelong(sz_size) / 2 - 50;
-        }
+        bkpinfo->media_size[0] = 0;
         log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
         if (bkpinfo->media_size[0] <= 0) {
@@ -1886 +1678 @@
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
-            sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3",
+            asprintf(&command, "mount | grep \"%s \" | cut -d' ' -f3",
                     bkpinfo->nfs_mount);
             strcpy(bkpinfo->isodir,
                    call_program_and_get_last_line_of_output(command));
+            paranoid_free(command);
         }
         if (bkpinfo->disaster_recovery) {
@@ -1903 +1696 @@
             sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d",
                     (int) (random() % 32768));
-            sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+            asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
-            sprintf(tmp, "mount %s -t nfs %s", bkpinfo->nfs_mount,
+            paranoid_free(command);
+
+            asprintf(&tmp, "mount %s -t nfs %s", bkpinfo->nfs_mount,
                     bkpinfo->isodir);
             run_program_and_log_output(tmp, 5);
+            paranoid_free(tmp);
             malloc_string(g_selfmounted_isodir);
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
@@ -1916 +1712 @@
             finish(1);
         }
-        strcpy(tmp, bkpinfo->nfs_remote_dir);
+        asprintf(&tmp, bkpinfo->nfs_remote_dir);
         if (!popup_and_get_string
             ("Directory", "Which directory within that mountpoint?", tmp,
@@ -1924 +1720 @@
         }
         strcpy(bkpinfo->nfs_remote_dir, tmp);
+        paranoid_free(tmp);
+
         // check whether writable - we better remove surrounding spaces for this
         strip_spaces(bkpinfo->nfs_remote_dir);
-        sprintf(command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+        asprintf(&command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
         while (run_program_and_log_output(command, FALSE)) {
-            strcpy(tmp, bkpinfo->nfs_remote_dir);
+            paranoid_free(tmp);
+            paranoid_free(prompt);
+            asprintf(&tmp, bkpinfo->nfs_remote_dir);
             asprintf(&prompt,
                      "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
@@ -1944 +1744 @@
                      bkpinfo->isodir, bkpinfo->nfs_remote_dir);
         }
+        paranoid_free(command);
+        paranoid_free(tmp);
+        paranoid_free(prompt);
+
         for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
             bkpinfo->media_size[i] = 650;
@@ -1977 +1781 @@
                     bkpinfo->media_size[i] = atoi(sz_size);
                 }
+                paranoid_free(sz_size);
+
                 if (!popup_and_get_string
                     ("Prefix.",
@@ -2063 +1869 @@
             finish(1);
         }
-        strcpy(tmp, list_of_NFS_mounts_only());
+        tmp = list_of_NFS_mounts_only();
         if (strlen(tmp) > 2) {
             if (bkpinfo->exclude_paths[0]) {
@@ -2070 +1876 @@
             strncpy(bkpinfo->exclude_paths, tmp, MAX_STR_LEN);
         }
+        paranoid_free(tmp);
 // NTFS 
-        strcpy(tmp,
+        asprintf(&tmp,
                call_program_and_get_last_line_of_output
                ("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
@@ -2084 +1891 @@
             strncpy(bkpinfo->image_devs, tmp, MAX_STR_LEN / 4);
         }
-
+        paranoid_free(tmp);
 
         if (!popup_and_get_string
@@ -2124 +1931 @@
 #else
     if (bkpinfo->backup_media_type == nfs) {
-        sprintf(tmp, "mount | grep \"%s\" | cut -d' ' -f3",
-                bkpinfo->nfs_mount);
-//      strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp));
         log_msg(3, "I think the NFS mount is mounted at %s",
                 bkpinfo->isodir);
@@ -2154 +1958 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(sz_size);
-    paranoid_free(command);
-    paranoid_free(comment);
-    paranoid_free(prompt);
     return (0);
 }
-
-
-
-
-/**
- * @addtogroup utilityGroup
- * @{
- */
-/**
- * Get a space-separated list of NFS devices and mounts.
- * @return The list created.
- * @note The return value points to static data that will be overwritten with each call.
- */
-char *list_of_NFS_devices_and_mounts(void)
-{
-    char *exclude_these_devices;
-    char *exclude_these_directories;
-    static char result_sz[512];
-
-    malloc_string(exclude_these_devices);
-    malloc_string(exclude_these_directories);
-    strcpy(exclude_these_directories,
-           call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    strcpy(exclude_these_devices,
-           call_program_and_get_last_line_of_output
-           ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    sprintf(result_sz, "%s %s", exclude_these_directories,
-            exclude_these_devices);
-    paranoid_free(exclude_these_devices);
-    paranoid_free(exclude_these_directories);
-    return (result_sz);
-}
-
-
 
 
@@ -2208 +1972 @@
     char *exclude_these_devices;
     char *exclude_these_directories;
-    static char result_sz[512];
-
-    malloc_string(exclude_these_devices);
-    malloc_string(exclude_these_directories);
-    strcpy(exclude_these_directories,
+    char *result_sz;
+
+    asprintf(&exclude_these_directories,
            call_program_and_get_last_line_of_output
            ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    strcpy(exclude_these_devices,
+    asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
            ("cat /etc/fstab | tr -s '\t' ' ' | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    sprintf(result_sz, "%s", exclude_these_directories);
+    asprintf(&result_sz, "%s", exclude_these_directories);
     paranoid_free(exclude_these_devices);
     paranoid_free(exclude_these_directories);
@@ -2224 +1986 @@
 }
 
+
 /* @} - end of utilityGroup */
-
-
-
-
 
 /**
@@ -2241 +2000 @@
     char *tmp;
 
-    malloc_string(tmp);
     assert_string_is_neither_NULL_nor_zerolength(stub);
 
@@ -2248 +2006 @@
     make_hole_for_file(store_name_here);
     mkfifo(store_name_here, S_IRWXU | S_IRWXG);
-    sprintf(tmp, "chmod 770 %s", store_name_here);
+    asprintf(&tmp, "chmod 770 %s", store_name_here);
     paranoid_system(tmp);
     paranoid_free(tmp);
 }
-
-
-
-
 
 
@@ -2268 +2022 @@
     char *tmp, *command, *sz;
 
-    malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(sz);
     assert(bkpinfo != NULL);
 
 #ifdef __FreeBSD__
-    strcpy(tmp,
+    asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("df -m -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
-    strcpy(tmp,
+    asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("df -m -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -v none | grep -v Filesystem | grep -v /dev/shm | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
@@ -2284 +2035 @@
 
     if (tmp[0] != '/') {
-        strcpy(sz, tmp);
-        strcpy(tmp, "/");
-        strcat(tmp, sz);
+        asprintf(&sz, "/%s", tmp);
+        paranoid_free(tmp);
+        tmp = sz;
     }
     if (!tmp[0]) {
@@ -2302 +2053 @@
             bkpinfo->scratchdir);
 
-    sprintf(command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
+    asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
+    paranoid_free(tmp);
+
     paranoid_system(command);
-    paranoid_free(tmp);
     paranoid_free(command);
-    paranoid_free(sz);
-}
-
-
-
-
+}
 
 
@@ -2329 +2076 @@
     char *command;
 
-    malloc_string(command);
     if (!dev || dev[0] == '\0') {
         output[0] = '\0';
         return (FALSE);
     }
-//  assert_string_is_neither_NULL_nor_zerolength(dev);
     log_msg(10, "Injecting %s", dev);
     inject_device(dev);
@@ -2341 +2086 @@
         return (FALSE);
     }
-    sprintf(command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null",
+    asprintf(&command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null",
             512L, dev);
     if (!run_program_and_log_output(command, FALSE)
@@ -2347 +2092 @@
         strcpy(output, dev);
         log_msg(4, "Found it - %s", dev);
+        paranoid_free(command);
         return (TRUE);
     } else {
         output[0] = '\0';
         log_msg(4, "It's not %s", dev);
+        paranoid_free(command);
         return (FALSE);
     }
 }
-
-
-
 
 
@@ -2372 +2116 @@
     char *tmp;
 
-    malloc_string(mountdev);
-    malloc_string(tmp);
     assert(bkpinfo != NULL);
-//  log_it("Asking what_number_cd_is_this");
     if (g_ISO_restore_mode) {
-        sprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
-//      log_it("tmp = %s", tmp);
-
-        strcpy(mountdev, call_program_and_get_last_line_of_output(tmp));
-        strcat(mountdev, "/archives/THIS-CD-NUMBER");
-//      log_it("mountdev = %s", mountdev);
+        asprintf(&tmp, "mount | grep iso9660 | awk '{print $3;}'");
+
+        asprintf(&mountdev, "%s/archives/THIS-CD-NUMBER", call_program_and_get_last_line_of_output(tmp));
+        paranoid_free(tmp);
+
         cd_number = atoi(last_line_of_file(mountdev));
-//      log_it("cd_number = %d", cd_number);
         paranoid_free(mountdev);
-        paranoid_free(tmp);
+
         return (cd_number);
     }
 
-    strcpy(mountdev, bkpinfo->media_device);
+    asprintf(&mountdev, bkpinfo->media_device);
     if (!mountdev[0]) {
         log_it
@@ -2401 +2140 @@
     cd_number =
         atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
-//  log_it("cd_number..later.. = %d", cd_number);
     paranoid_free(mountdev);
-    paranoid_free(tmp);
     return (cd_number);
 }
-
-
-
-
-
 
 
@@ -2423 +2155 @@
 {
     /*@ buffers **************** */
-    static char tmp[MAX_STR_LEN];
+    char *tmp;
 
 
 #ifdef __FreeBSD__
-    strcpy(tmp, call_program_and_get_last_line_of_output
+    asprintf(&tmp, call_program_and_get_last_line_of_output
            ("mount | grep \" on / \" | cut -d' ' -f1"));
 #else
-    strcpy(tmp, call_program_and_get_last_line_of_output
+    asprintf(&tmp, call_program_and_get_last_line_of_output
            ("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//"));
     if (strstr(tmp, "/dev/cciss/")) {
-        strcpy(tmp, call_program_and_get_last_line_of_output
+        paranoid_free(tmp);
+        asprintf(&tmp, call_program_and_get_last_line_of_output
                ("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1"));
     }
     if (strstr(tmp, "/dev/md")) {
-        strcpy(tmp,
+        paranoid_free(tmp);
+        asprintf(&tmp,
                call_program_and_get_last_line_of_output
                ("mount | grep \" on / \" | cut -d' ' -f1"));
@@ -2502 +2236 @@
     /*@ buffer ***************************************************** */
     char *list_drives_cmd;
-    char *current_drive;
+    char *current_drive = NULL;
 
     /*@ pointers *************************************************** */
@@ -2510 +2244 @@
     int count_lilos = 0;
     int count_grubs = 0;
+    int n = 0;
 
     /*@ end vars *************************************************** */
-
-    malloc_string(list_drives_cmd);
-    malloc_string(current_drive);
 
 #ifdef __IA64__
@@ -2521 +2253 @@
 #endif
     assert(which_device != NULL);
-    //  sprintf (list_drives_cmd,
-    //       "fdisk -l | grep /dev | grep cyl | tr ':' ' ' | cut -d' ' -f2");
-
-    sprintf(list_drives_cmd,
+    asprintf(&list_drives_cmd,
             // "parted2fdisk
             "fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
@@ -2533 +2262 @@
         log_OS_error("Unable to open list of drives");
         paranoid_free(list_drives_cmd);
-        paranoid_free(current_drive);
         return ('\0');
     }
-    for (fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-         fgets(current_drive, MAX_STR_LEN, pdrives)) {
+    paranoid_free(list_drives_cmd);
+
+    for (getline(&current_drive, &n, pdrives); !feof(pdrives);
+         getline(&current_drive, &n, pdrives)) {
         strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
@@ -2551 +2281 @@
         }
     }
+    paranoid_free(current_drive);
+
     if (pclose(pdrives)) {
         log_OS_error("Cannot pclose pdrives");
     }
     log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-    paranoid_free(list_drives_cmd);
-    paranoid_free(current_drive);
     if (count_grubs && !count_lilos) {
         return ('G');
@@ -2572 +2302 @@
 
 
-
-
 /**
  * Write zeroes over the first 16K of @p device.
@@ -2599 +2327 @@
 }
 
+
 /**
  * Return the device pointed to by @p incoming.
  * @param incoming The device to resolve symlinks for.
  * @return The path to the real device file.
- * @note The returned string points to static storage that will be overwritten with each call.
+ * @note The returned string points to a storage that need to be freed by the caller
  * @bug Won't work with file v4.0; needs to be written in C.
  */
 char *resolve_softlinks_to_get_to_actual_device_file(char *incoming)
 {
-    static char output[MAX_STR_LEN];
+    char *output;
     char *command;
     char *curr_fname;
@@ -2616 +2345 @@
 
     struct stat statbuf;
-    command = malloc(1000);
-    malloc_string(tmp);
-    malloc_string(scratch);
-    malloc_string(curr_fname);
     if (!does_file_exist(incoming)) {
         log_it
             ("resolve_softlinks_to_get_to_actual_device_file --- device not found");
-        strcpy(output, incoming);
-    } else {
-        strcpy(curr_fname, incoming);
+        asprintf(&output, incoming);
+    } else {
+        asprintf(&curr_fname, incoming);
         lstat(curr_fname, &statbuf);
         while (S_ISLNK(statbuf.st_mode)) {
             log_msg(1, "curr_fname = %s", curr_fname);
-            sprintf(command, "file %s", curr_fname);
-            strcpy(tmp, call_program_and_get_last_line_of_output(command));
+            asprintf(&command, "file %s", curr_fname);
+            asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+            paranoid_free(command);
+
             for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' ';
                  p--);
             p++;
-            strcpy(scratch, p);
+            asprintf(&scratch, p);
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
             log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp,
                     scratch);
+            paranoid_free(tmp);
+
             if (scratch[0] == '/') {
-                strcpy(curr_fname, scratch);    // copy whole thing because it's an absolute softlink
+                paranoid_free(curr_fname);
+                asprintf(&curr_fname, scratch); // copy whole thing because it's an absolute softlink
             } else {            // copy over the basename cos it's a relative softlink
                 p = curr_fname + strlen(curr_fname);
@@ -2649 +2379 @@
                     p++;
                 }
-                strcpy(p, scratch);
-            }
+                *p = '\0';
+                asprintf(&tmp, "%s%s", curr_fname, scratch);
+                paranoid_free(curr_fname);
+                curr_fname = tmp;
+            }
+            paranoid_free(scratch);
             lstat(curr_fname, &statbuf);
         }
-        strcpy(output, curr_fname);
+        asprintf(&output, curr_fname);
         log_it("resolved %s to %s", incoming, output);
-    }
-    paranoid_free(command);
-    paranoid_free(curr_fname);
-    paranoid_free(tmp);
+        paranoid_free(curr_fname);
+    }
     return (output);
 }
@@ -2667 +2399 @@
 /**
  * Return the type of partition format (GPT or MBR)
+ * Caller needs to free the return value
  */
 char *which_partition_format(const char *drive)
 {
-    static char output[4];
+    char *output;
     char *tmp;
     char *command;
     char *fdisk;
 
-    malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(fdisk);
     log_msg(0, "Looking for partition table format type");
 // BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
@@ -2683 +2413 @@
     struct stat buf;
 
-    sprintf(fdisk, "/usr/local/bin/fdisk");
+    asprintf(&fdisk, "/usr/local/bin/fdisk");
     if (stat(fdisk, &buf) != 0) {
-#endif
-        sprintf(fdisk, "/sbin/fdisk");
+        paranoid_free(fdisk);
+#endif
+        asprintf(&fdisk, "/sbin/fdisk");
 #ifdef __IA64__
     }
 #endif
     log_msg(1, "Using %s", fdisk);
-    sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
+    paranoid_free(fdisk);
+
+    asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    paranoid_free(command);
+
     if (strstr(tmp, "GPT") == NULL) {
-        strcpy(output, "MBR");
-    } else {
-        strcpy(output, "GPT");
-    }
+        asprintf(&output, "MBR");
+    } else {
+        asprintf(&output, "GPT");
+    }
+    paranoid_free(tmp);
     log_msg(0, "Found %s partition table format type", output);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(fdisk);
     return (output);
 }

trunk/mondo/mondo/common/libmondo-devices.h

@@ -39 +39 @@
 int eject_device(char *);
 
-char *list_of_NFS_devices_and_mounts();
 char *list_of_NFS_mounts_only();
 

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

@@ -457 +457 @@
             res++;
         }
+        paranoid_free(part_table_fmt);
+
         /* does partition /dev/hdNX exist more than once in the mountlist? */
         for (i = 0, mountpoint_copies = 0, device_copies = 0;

trunk/mondo/mondo/common/libmondo-stream-EXT.h

@@ -23 +23 @@
 extern int read_header_block_from_stream(long long *plen, char *filename,
                                          int *pcontrol_char);
+#ifndef S_SPLINT_S
 extern int register_in_tape_catalog(t_archtype type, int number, long aux,
                                     char *fn);
+#endif
 extern bool should_we_write_to_next_tape(long mediasize,
                                          long long

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

@@ -209 +209 @@
  * this platform, then the IDE tape, then "/dev/st0", then "/dev/osst0".
  * @param dev Where to put the found tape device.
- * @param siz Where to put the tape size (a string like "4GB")
+ * @param siz Where to put the tape size (a string like "4GB"). Should be freed by caller
  * @return 0 if success, nonzero if failure (in which @p dev and @p siz are undefined).
  */
@@ -220 +220 @@
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    dev[0] = siz[0] = '\0';
+    dev[0] = '\0';
+    siz = NULL;
     if (find_home_of_exe("cdrecord")) {
         asprintf(&cdr_exe, "cdrecord");
@@ -235 +236 @@
             ("Either too few or too many tape streamers for me to detect...");
         strcpy(dev, VANILLA_SCSI_TAPE);
+        paranoid_free(tmp);
+        paranoid_free(cdr_exe);
         return 1;
     }
@@ -246 +249 @@
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
+        paranoid_free(tmp);
+        paranoid_free(cdr_exe);
         return 1;
     }
@@ -303 +308 @@
     }
 
-    siz[0] = '\0';
     log_it("res=%d; dev=%s", res, dev);
 
     if (res) {
+        paranoid_free(tmp);
         return (res);
     }
 
     if (strlen(tmp) < 2) {
-        siz[0] = '\0';
         log_it("Warning - size of tape unknown");
+        paranoid_free(tmp);
         return (0);
     } else {
-        strcpy(siz, tmp);
+        siz = tmp;
         return (0);
     }
-    paranoid_free(tmp);
 }
 

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

@@ -19 +19 @@
 #include <netdb.h>
 #include <netinet/in.h>
+#ifndef S_SPLINT_S
 #include <arpa/inet.h>
+#endif
 
 /*@unused@*/

trunk/mondo/mondo/common/my-stuff.h

@@ -115 +115 @@
  */
 #ifdef NDEBUG
-#define assert(exp) ((void)0)
+#   define assert(exp) ((void)0)
 #else
-#define assert(exp) ((exp)?((void)0):_mondo_assert_fail(__FILE__, __FUNCTION__, __LINE__, #exp))
+#   ifndef S_SPLINT_S
+#       define assert(exp) ((exp)?((void)0):_mondo_assert_fail(__FILE__, __FUNCTION__, __LINE__, #exp))
+#   else
+#       define assert(exp) ((void)0)
+#   endif
 #endif
 
@@ -240 +244 @@
  */
 #define MAX_TAPECAT_FNAME_LEN 32
-
-//#define strcpy(y,x) strncpy(y, x, sizeof(y)-1)
-
 
 /**

trunk/mondo/mondo/common/newt-specific.c

@@ -313 +313 @@
 
         system
-            ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
+            ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
         if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
             printf("Please try the latest SVN version ");
@@ -686 +686 @@
  * @param title The title of the dialog box.
  * @param b The blurb (e.g. what you want the user to enter).
- * @param output The string to put the user's answer in.
+ * @param output The string to put the user's answer in. It has to be freed by the caller
  * @param maxsize The size in bytes allocated to @p output.
  * @return TRUE if the user pressed OK, FALSE if they pressed Cancel.
@@ -707 +707 @@
         char *blurb;
         char *original_contents;
+        int n = 0;
 
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
-        assert(output != NULL);
 
         if (g_text_mode) {
@@ -716 +716 @@
                 ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
                  title, b);
-            (void) fgets(output, maxsize, stdin);
+            (void) getline(&output, &n, stdin);
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
@@ -723 +723 @@
         asprintf(&blurb, b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        asprintf(&original_contents, output);
-        output[0] = '\0';
+        original_contents = output;
+
         type_here =
             newtEntry(2, newtTextboxGetNumLines(text) + 2,
@@ -745 +745 @@
         paranoid_free(blurb);
         b_res = newtRunForm(myForm);
-        strcpy(output, entry_value);
+        output = entry_value;
         newtPopHelpLine();
         newtFormDestroy(myForm);
         newtPopWindow();
         if (b_res == b_2) {
-            strcpy(output, original_contents);
+            paranoid_free(output);
+            output = original_contents;
             paranoid_free(original_contents);
             return (FALSE);

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -367 +367 @@
 
     long itbs;
-
-    malloc_string(tmp);
-    malloc_string(psz);
 
     assert(bkpinfo != NULL);
@@ -532 +529 @@
         }
         flag_set['d'] = TRUE;
-        sprintf(tmp,
+        paranoid_free(tmp); // allocation from find_tape_device_and_size
+
+        asprintf(&tmp,
                 "You didn't specify a tape streamer device. I'm assuming %s",
                 flag_val['d']);
         log_to_screen(tmp);
+        paranoid_free(tmp);
         percent = 0;
     }
@@ -616 +616 @@
             strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
         }
-        sprintf(tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
+        asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
         strncpy(bkpinfo->isodir,
                 call_program_and_get_last_line_of_output(tmp),
                 MAX_STR_LEN / 4);
+        paranoid_free(tmp);
+
         if (strlen(bkpinfo->isodir) < 3) {
             retval++;
@@ -670 +672 @@
     if (flag_set['N'])          // exclude NFS mounts & devices
     {
-//      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-        strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
+        psz = list_of_NFS_mounts_only();
         if (bkpinfo->exclude_paths[0]) {
             strncat(bkpinfo->exclude_paths, " ", MAX_STR_LEN);
         }
         strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN);
+        paranoid_free(psz);
+
         log_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
@@ -684 +687 @@
     }
     if (flag_set['b']) {
-        strcpy(psz, flag_val['b']);
+        asprintf(&psz, flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -692 +695 @@
             itbs = atol(psz);
         }
+        paranoid_free(psz);
+
         log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
@@ -725 +730 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            sprintf(tmp,
+            asprintf(&tmp,
                     "You specified kernel '%s', which does not exist\n",
                     bkpinfo->kernel_path);
             log_to_screen(tmp);
+            paranoid_free(tmp);
         }
     }
@@ -739 +745 @@
         if (flag_set['i']) {
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
-            sprintf(tmp, "ls -l %s", bkpinfo->isodir);
+            asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, FALSE)) {
                 fatal_error
                     ("output folder does not exist - please create it");
             }
+            paranoid_free(tmp);
         } else if (flag_set['n']) {
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
@@ -753 +760 @@
 
     if (flag_set['n']) {
-        sprintf(tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+        asprintf(&tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
         if (run_program_and_log_output(tmp, FALSE)) {
             retval++;
-            sprintf(tmp,
+            paranoid_free(tmp);
+            asprintf(&tmp,
                     "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
                     bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
             log_to_screen(tmp);
         }
+        paranoid_free(tmp);
     }
 
@@ -802 +811 @@
         sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
                 random() % 32768);
-        sprintf(tmp, "touch %s/.foo.dat", flag_val['T']);
+        asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
             retval++;
@@ -809 +818 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
+        paranoid_free(tmp);
+
+        asprintf(&tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
                 flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
@@ -817 +828 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
+        paranoid_free(tmp);
     }
     if (flag_set['A']) {
@@ -851 +863 @@
     }
     if (flag_set['f']) {
-        strncpy(bkpinfo->boot_device,
-                resolve_softlinks_to_get_to_actual_device_file(flag_val
-                                                               ['f']),
+        tmp = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
+        strncpy(bkpinfo->boot_device, tmp,
                 MAX_STR_LEN / 4);
     }
-    if (flag_set['P']) {
-        strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
-    }
     if (flag_set['Q']) {
+        if (tmp == NULL) {
+            printf("-f option required when using -Q\n");
+            finish(-1);
+        }
         i = which_boot_loader(tmp);
         log_msg(3, "boot loader is %c, residing at %s", i, tmp);
         printf("boot loader is %c, residing at %s\n", i, tmp);
         finish(0);
+    }
+    paranoid_free(tmp);
+
+    if (flag_set['P']) {
+        strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
     }
     if (flag_set['L']) {
@@ -928 +945 @@
 /* and finally... */
 
-    paranoid_free(tmp);
-    paranoid_free(psz);
     return (retval);
 }

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -488 +488 @@
             if (lvmversion == 2) {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
+                       ("tail -n5 "MONDO_LOGFILE" | grep Insufficient | tail -n1"));
             } else {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
+                       ("tail -n5 "MONDO_LOGFILE" | grep lvcreate | tail -n1"));
             }
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);
@@ -1833 +1833 @@
         }
     }
+    paranoid_free(part_table_fmt);
     strcat(output + strlen(output), "\n");  /*start block (ENTER for next free blk */
     if (partsize > 0) {

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -3302 +3302 @@
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
     run_program_and_log_output
-        ("ln -sf /var/log/mondo-archive.log /tmp/mondo-restore.log",
+        ("ln -sf "MONDO_LOGFILE" /tmp/mondo-restore.log",
          FALSE);
 

trunk/tools/mkrpm

@@ -6 +6 @@
 #
 
+umask 022
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`

trunk/tools/quality

@@ -46 +46 @@
 echo " "
 echo "Splint: "
-find . -name '*.c' -o -name '*.h' | xargs splint +gnuextensions +posixlib -Dlinux
+find . -name '*.c' -o -name '*.h' | xargs splint +posixlib -Dlinux
 
 rm -f /tmp/mondo.quality