Changeset 2316 in MondoRescue

Timestamp:

Aug 18, 2009, 2:34:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3327@localhost: bruno | 2009-08-04 00:17:46 +0200
popup_and_get_string and build_partition_name now return an allocated string

Location:

branches/2.2.10

Files:

• mondo/src/common/libmondo-cli.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (26 diffs)
• mondo/src/common/libmondo-files.c (modified) (2 diffs)
• mondo/src/common/libmondo-fork.c (modified) (2 diffs)
• mondo/src/common/libmondo-mountlist.c (modified) (13 diffs)
• mondo/src/common/libmondo-string-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-string.c (modified) (1 diff)
• mondo/src/common/libmondo-string.h (modified) (1 diff)
• mondo/src/common/libmondo-verify.h (modified) (1 diff)
• mondo/src/common/newt-specific-EXT.h (modified) (1 diff)
• mondo/src/common/newt-specific.c (modified) (7 diffs)
• mondo/src/common/newt-specific.h (modified) (1 diff)
• mondo/src/include/mr_mem.h (modified) (2 diffs)
• mondo/src/lib/mr_mem.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (21 diffs)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (13 diffs)
• mondo/src/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (18 diffs)
• mondo/src/mondorestore/mondoprep.h (modified) (1 diff)
• mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)
• mondo/src/mondorestore/mr-externs.h (modified) (1 diff)
• tools/quality (modified) (1 diff)

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

@@ -1281 +1281 @@
         && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
-            if (popup_and_get_string
-                ("Device", "Please specify the device",
-                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
+            tmp2 = popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
+            if (tmp2 == NULL) {
                 retval++;
                 log_to_screen("User opted to cancel.");
             }
+            mr_free(tmp2);
         } else if (find_cdrw_device(bkpinfo->media_device)) {
             retval++;

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

@@ -323 +323 @@
     char *incoming;
     char *searchstr = NULL;
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ ints ******************************************************* */
@@ -337 +337 @@
 
     malloc_string(incoming);
-    malloc_string(searchstr);
-    malloc_string(tmp);
 
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive, build_partition_name(tmp, drive, partno));
+    tmp = build_partition_name(drive, partno);
+    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive, tmp);
+    mr_free(tmp);
+
     res = system(program);
     mr_free(program);
     return (res);
 #else
-    tmp[0] = '\0';
+    /* To avoid compiler warnings */
+    tmp = NULL;
 #endif
 
@@ -360 +362 @@
     mr_free(program);
 
-    (void) build_partition_name(searchstr, drive, partno);
-    strcat(searchstr, " ");
+    searchstr = build_partition_name(drive, partno);
+    mr_strcat(searchstr, " ");
     for (res = 0; !res && fgets(incoming, MAX_STR_LEN - 1, fin);) {
         if (strstr(incoming, searchstr)) {
@@ -367 +369 @@
         }
     }
+    mr_free(searchstr);
+
     if (pclose(fin)) {
         log_OS_error("Cannot pclose fin");
     }
     paranoid_free(incoming);
-    paranoid_free(searchstr);
-    paranoid_free(tmp);
     return (res);
 }
@@ -448 +450 @@
     int res;
     char *dev;
+    char *p = NULL;
 
     /*@ end vars **************************************************** */
@@ -472 +475 @@
 
     if (!dev[0] || (res = mount_CDROM_here(dev, mountpoint))) {
-        if (!popup_and_get_string
-            ("CD-ROM device", "Please enter your CD-ROM's /dev device",
-             dev, MAX_STR_LEN / 4)) {
+        p = popup_and_get_string ("CD-ROM device", "Please enter your CD-ROM's /dev device",dev);
+        if (p == NULL) {
             res = 1;
         } else {
-            res = mount_CDROM_here(dev, mountpoint);
-        }
+            res = mount_CDROM_here(p, mountpoint);
+        }
+        mr_free(p);
     }
     if (res) {
@@ -1025 +1028 @@
     FILE *pin;
     int retval;
-    malloc_string(good_formats);
 
     assert_string_is_neither_NULL_nor_zerolength(format);
@@ -1044 +1046 @@
         retval = 0;
     } else {
-        strcpy(good_formats, " ");
-        (void) fgets(good_formats + 1, MAX_STR_LEN - 1, pin);
+        mr_getline(&good_formats, pin);
         if (pclose(pin)) {
             log_OS_error("Cannot pclose good formats");
         }
-        strip_spaces(good_formats);
-        strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 "); // " ntfs 7 " -- um, cheating much? :)
+        mr_strip_spaces(good_formats);
+        mr_strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 ");  // " ntfs 7 " -- um, cheating much? :)
         if (strstr(good_formats, format_sz)) {
             retval = 1;
@@ -1056 +1057 @@
             retval = 0;
         }
+        mr_free(good_formats);
     }
     mr_free(format_sz);
 
-    paranoid_free(good_formats);
     return (retval);
 }
@@ -1445 +1446 @@
 {
     char *tmp = NULL;
-    char *tmp1 = NULL;
+    char *p = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
@@ -1455 +1456 @@
 
     malloc_string(prompt);
-    malloc_string(sz_size);
     malloc_string(tmp1);
     assert(bkpinfo != NULL);
@@ -1514 +1514 @@
                 find_dvd_device(bkpinfo->media_device, FALSE);
                 strcpy(tmp1, "1");
-                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                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);
                 strcpy(tmp1, "4");
-                sprintf(sz_size, "%d", 650);
+                mr_asprintf(&sz_size, "%d", 650);
                 log_msg(1, "Setting to CD defaults");
             }
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
+                p = popup_and_get_string("Speed", comment, tmp);
+                mr_free(tmp);
+
+                if (p == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
                     mr_free(comment);
                     finish(1);
                 }
+                /* tmp now has the new value given by the user */
+                tmp = p;
             }
             mr_free(comment);
@@ -1535 +1540 @@
             mr_asprintf(&comment, "How much data (in Megabytes) will each %s store?", mds);
             mr_free(mds);
-            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
-                mr_free(comment);
+            p = popup_and_get_string("Size", comment, sz_size);
+            mr_free(sz_size);
+            mr_free(comment);
+
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_free(comment);
+            sz_size = p;
 
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -1571 +1579 @@
                         bkpinfo->media_device);
                 mr_asprintf(&comment, "Please specify your %s drive's /dev entry", mds);
-                if (!popup_and_get_string
-                    ("Device?", comment, bkpinfo->media_device,
-                     MAX_STR_LEN / 4)) {
-                    mr_free(comment);
+                p = popup_and_get_string("Device?", comment, bkpinfo->media_device);
+                mr_free(comment);
+
+                if (p == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                mr_free(comment);
+                strcpy(bkpinfo->media_device, p);
+                mr_free(p);
             }
             log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
@@ -1598 +1607 @@
             if (!bkpinfo->media_device[0]) {
                 if (bkpinfo->backup_media_type == usb) {
-                    i = popup_and_get_string("/dev entry?",
-                                         "What is the /dev entry of your USB Disk/Key, please?",
-                                         bkpinfo->media_device,
-                                         MAX_STR_LEN / 4);
+                    p = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device);
                 } else {
                     if (g_kernel_version < 2.6) {
-                        i = popup_and_get_string("Device node?",
-                                             "What is the SCSI node of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
+                        p = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device);
                     } else {
-                        i = popup_and_get_string("/dev entry?",
-                                             "What is the /dev entry of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
+                        p = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device);
                     }
                 }
-                if (!i) {
+                if (p == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
+                strcpy(bkpinfo->media_device, p);
+                mr_free(p);
             }
         }
@@ -1664 +1666 @@
         }
         if (!bkpinfo->media_device[0]) {
-            if (!popup_and_get_string
-                ("Device name?",
-                 "What is the /dev entry of your tape streamer?",
-                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
+            p = popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device);
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            strcpy(bkpinfo->media_device, p);
+            mr_free(p);
         }
         mr_asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
@@ -1716 +1718 @@
 #endif
         {
-            if (!popup_and_get_string
-                ("NFS dir.",
-                 "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
-                 bkpinfo->nfs_mount, MAX_STR_LEN / 4)) {
+            p = popup_and_get_string("NFS dir.", "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)", bkpinfo->nfs_mount);
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            strcpy(bkpinfo->nfs_mount, p);
+            mr_free(p);
             if (!bkpinfo->restore_data) {
                 if ((bkpinfo->compression_level =
@@ -1743 +1745 @@
             if (!bkpinfo->restore_data) {
                 mr_asprintf(&comment, "How much data (in Megabytes) will each media store?");
-                if (!popup_and_get_string("Size", comment, sz_size, 5)) {
-                    mr_free(comment);
+                // BERLIOS: 4480 shouldn't be hardcoded here
+                sz_size = popup_and_get_string("Size", comment, "4480");
+                mr_free(comment);
+                if (sz_size == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                mr_free(comment);
             } else {
-                strcpy(sz_size, "0");
+                mr_asprintf(&sz_size, "0");
             }
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
                 bkpinfo->media_size[i] = atoi(sz_size);
             }
+            mr_free(sz_size);
             if (bkpinfo->media_size[0] < 0) {
                 log_to_screen("User has chosen not to backup the PC");
@@ -1765 +1769 @@
             mr_free(command);
 
-            if (!popup_and_get_string
-                ("NFS share", "Which remote NFS share should I mount?",
-                 bkpinfo->nfs_mount, MAX_STR_LEN)) {
+            p = popup_and_get_string("NFS share", "Which remote NFS share should I mount?", bkpinfo->nfs_mount);
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            strcpy(bkpinfo->nfs_mount, p);
+            mr_free(p);
         }
         /* Initiate bkpinfo isodir path from running environment if mount already done */
@@ -1795 +1800 @@
             finish(1);
         }
-        strcpy(tmp1, bkpinfo->nfs_remote_dir);
-        if (!popup_and_get_string
-            ("Directory", "Which directory within that mountpoint?", tmp1,
-             MAX_STR_LEN)) {
+        p = popup_and_get_string("Directory", "Which directory within that mountpoint?", bkpinfo->nfs_remote_dir);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        strcpy(bkpinfo->nfs_remote_dir, tmp1);
+        strcpy(bkpinfo->nfs_remote_dir, p);
+        mr_free(p);
 
         // check whether writable - we better remove surrounding spaces for this
         strip_spaces(bkpinfo->nfs_remote_dir);
 
-        if (!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, MAX_STR_LEN / 4)) {
+        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);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
-
-        for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-            bkpinfo->media_size[i] = 650;
-        }
-        log_msg(3, "Just set nfs_remote_dir to %s",
-                bkpinfo->nfs_remote_dir);
+        strcpy(bkpinfo->prefix, p);
+        mr_free(p);
+
+        log_msg(3, "Just set nfs_remote_dir to %s", bkpinfo->nfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
@@ -1826 +1826 @@
     case iso:
         if (!bkpinfo->disaster_recovery) {
-            if (!popup_and_get_string
-                ("Storage dir.",
-                 "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0",
-                 bkpinfo->isodir, MAX_STR_LEN / 4)) {
+            p = popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir);
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            strcpy(bkpinfo->isodir,p);
+            mr_free(p);
+
             if (archiving_to_media) {
                 if ((bkpinfo->compression_level =
@@ -1839 +1840 @@
                     finish(1);
                 }
-                if (!popup_and_get_string
-                    ("ISO size.",
-                     "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.",
-                     sz_size, 16)) {
+                p = popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.", sz_size);
+                if (p == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
                 for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = atoi(sz_size);
+                    bkpinfo->media_size[i] = atoi(p);
                 }
+                mr_free(p);
             } else {
                 for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -1855 +1855 @@
             }
         }
-        if (!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, MAX_STR_LEN / 4)) {
+        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);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
+        strcpy(bkpinfo->prefix, p);
+        mr_free(p);
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
@@ -1885 +1885 @@
 
 #ifdef __FreeBSD__
-            if (!popup_and_get_string
-                ("Boot device",
-                 "What is your boot device? (e.g. /dev/ad0)",
-                 bkpinfo->boot_device, MAX_STR_LEN / 4)) {
+            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/ad0)", bkpinfo->boot_device);
+            if (!p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            strcpy(bkpinfo->boot_device, p);
+            mr_free(p);
             i = which_boot_loader(bkpinfo->boot_device);
 #else
-            if (!popup_and_get_string
-                ("Boot device",
-                 "What is your boot device? (e.g. /dev/hda)",
-                 bkpinfo->boot_device, MAX_STR_LEN / 4)) {
+            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", bkpinfo->boot_device);
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            if (does_string_exist_in_boot_block
-                (bkpinfo->boot_device, "LILO")) {
+            strcpy(bkpinfo->boot_device, p);
+            mr_free(p);
+
+            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
                 i = 'L';
             } else
-                if (does_string_exist_in_boot_block
-                    (bkpinfo->boot_device, "ELILO")) {
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
                 i = 'E';
             } else
-                if (does_string_exist_in_boot_block
-                    (bkpinfo->boot_device, "GRUB")) {
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "GRUB")) {
                 i = 'G';
             } else {
@@ -1930 +1928 @@
         bkpinfo->boot_loader = i;
         strcpy(bkpinfo->include_paths, "/");
-        if (!popup_and_get_string
-            ("Backup paths",
-             "Please enter paths which you want me to backup. The default is '/' (i.e. everything).",
-             bkpinfo->include_paths, MAX_STR_LEN)) {
+        p = popup_and_get_string("Backup paths", "Please enter paths which you want me to backup. The default is '/' (i.e. everything).", bkpinfo->include_paths);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
+        strcpy(bkpinfo->include_paths, p);
+        mr_free(p);
+
         mr_asprintf(&tmp, "%s", list_of_NFS_mounts_only());
         if (strlen(tmp) > 2) {
@@ -1948 +1947 @@
         strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
         if (strlen(tmp1) > 2) {
-            if (!popup_and_get_string
-                ("NTFS partitions",
-                 "Please enter/confirm the NTFS partitions you wish to backup as well.",
-                 tmp1, MAX_STR_LEN / 4)) {
+            p = popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp);
+
+            if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            strncpy(bkpinfo->image_devs, tmp1, MAX_STR_LEN / 4);
-        }
-
-
-        if (!popup_and_get_string
-            ("Exclude paths",
-             "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.",
-             bkpinfo->exclude_paths, (4*MAX_STR_LEN)-1)) {
+            strncpy(bkpinfo->image_devs, p, MAX_STR_LEN / 4);
+            mr_free(p);
+        }
+
+
+        p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        if (!popup_and_get_string
-            ("Temporary directory",
-             "Please enter your temporary directory.",
-             bkpinfo->tmpdir, (4*MAX_STR_LEN)-1)) {
+        strcpy(bkpinfo->exclude_paths, p);
+        mr_free(p);
+
+        p = popup_and_get_string("Temporary directory", "Please enter your temporary directory.", bkpinfo->tmpdir);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        if (!popup_and_get_string
-            ("Scratch directory",
-             "Please enter your scratch directory.",
-             bkpinfo->scratchdir, (4*MAX_STR_LEN)-1)) {
+        strcpy(bkpinfo->tmpdir, p);
+        mr_free(p);
+
+        p = popup_and_get_string("Scratch directory", "Please enter your scratch directory.", bkpinfo->scratchdir);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
+        strcpy(bkpinfo->scratchdir, p);
+        mr_free(p);
+
 // Interactive mode:
 #ifdef __IA64__

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

@@ -306 +306 @@
             return (1);
         }
-        if (!popup_and_get_string
-            ("Kernel path",
-             "What is the full path and filename of your kernel, please?",
-             kernel, MAX_STR_LEN / 4)) {
-            fatal_error
-                ("Kernel not found. Please specify with the '-k' flag.");
-        }
-        mr_asprintf(&tmp, "User says kernel is at %s", kernel);
-        log_it(tmp);
+        tmp = popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel);
+        if (tmp == NULL) {
+            fatal_error("Kernel not found. Please specify with the '-k' flag.");
+        }
+        strcpy(kernel, tmp);
         mr_free(tmp);
+
+        log_it("User says kernel is at %s", kernel);
     }
     return (0);
@@ -1184 +1182 @@
     }
 
-    mr_asprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_dev);
     mr_free(nfs_dev);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_ipaddr);
     mr_free(nfs_client_ipaddr);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_netmask);
     mr_free(nfs_client_netmask);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_broadcast);
     mr_free(nfs_client_broadcast);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_defgw);
     mr_free(nfs_client_defgw);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_server_ipaddr);
     mr_free(tmp);
     mr_free(nfs_server_ipaddr);
 
-    mr_asprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
     mr_free(tmp);
     mr_free(nfs_mount);
 
-    mr_asprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
     mr_free(tmp);

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

@@ -248 +248 @@
     char *callstr = NULL;
     char incoming[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN * 2];
     char *tmp1 = NULL;
-    char initial_label[MAX_STR_LEN * 2];
 
     /*@ int ********************************************************* */
     int res;
     int i;
-    int len;
     bool log_if_failure = FALSE;
     bool log_if_success = FALSE;
@@ -284 +281 @@
 
 
-    len = (int) strlen(program);
-    for (i = 0; i < 35 - len / 2; i++) {
-        tmp[i] = '-';
-    }
-    tmp[i] = '\0';
-    strcat(tmp, " ");
-    strcat(tmp, program);
-    strcat(tmp, " ");
-    for (i = 0; i < 35 - len / 2; i++) {
-        strcat(tmp, "-");
-    }
-    strcpy(initial_label, tmp);
     res = system(callstr);
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {
         log_msg(0, "running: %s", callstr);
-        log_msg(0,
-                "--------------------------------start of output-----------------------------");
+        log_msg(0, "--------------------------------start of output-----------------------------");
     }
     mr_free(callstr);

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

@@ -59 +59 @@
     /*@ buffers ******************************************************** */
     char tmp = NULL;
-    char device[MAX_STR_LEN];
+    char *device = NULL;
     char mountpoint[MAX_STR_LEN];
 
@@ -90 +90 @@
     /* check DD */
     for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-        sprintf(device, "%s%c", drive, cur_sp_no);
-        if (find_device_in_mountlist(mountlist, device) >= 0)
+        mr_asprintf(&device, "%s%c", drive, cur_sp_no);
+        if (find_device_in_mountlist(mountlist, device) >= 0) {
             foundsome = TRUE;
+        }
+        mr_free(device);
     }
     if (foundsome) {
         for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-            sprintf(device, "%s%c", drive, cur_sp_no);
+            mr_asprintf(&device, "%s%c", drive, cur_sp_no);
             pos = find_device_in_mountlist(mountlist, device);
             if (pos < 0) {
+                mr_free(device);
                 continue;
             }
@@ -156 +159 @@
                 res++;
             }
+            mr_free(device);
+
             amount_allocated += mountlist->el[pos].size / 1024L;
             prev_sp_no = cur_sp_no;
@@ -163 +168 @@
     npos = pos = 0;
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        build_partition_name(device, drive, curr_part_no);
+        device = build_partition_name(drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         npos = 0;
         for (cur_sp_no = 'a'; cur_sp_no <= 'h'; cur_sp_no++) {
-            sprintf(device, "%ss%i%c", device, curr_part_no, cur_sp_no);
-            if (find_device_in_mountlist(mountlist, device) >= 0)
+            mr_asprintf(&tmp, "%ss%i%c", device, curr_part_no, cur_sp_no);
+            if (find_device_in_mountlist(mountlist, tmp) >= 0) {
                 npos++;
-        }
+            }
+            mr_free(tmp);
+        }
+        mr_free(device);
+
         if (((pos >= 0) || npos) && foundsome) {
             mr_strcat(flaws_str, " %s has both DD and PC-style partitions.", drive);
@@ -176 +185 @@
         }
 
-        build_partition_name(device, drive, curr_part_no);
+        device = build_partition_name(drive, curr_part_no);
         strcpy(mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
@@ -256 +265 @@
             /* Check subpartitions */
             for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-                sprintf(device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
+                mr_free(device);
+                mr_asprintf(device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
                 pos = find_device_in_mountlist(mountlist, device);
                 if (pos < 0) {
@@ -321 +331 @@
             }
         }
+        mr_free(device);
 
         /* OK, continue with main loop */
@@ -380 +391 @@
     mr_asprintf(&flaws_str, "%s", "");
 
-    malloc_string(device);
     prev_part_no = 0;
 
@@ -391 +401 @@
         log_msg(1, tmp);
         mr_free(tmp);
-        goto endoffunc;
+        return(flaws_str);
     } else {
         mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
@@ -399 +409 @@
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        build_partition_name(device, drive, curr_part_no);
+        device = build_partition_name(drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
@@ -441 +451 @@
         }
         if (device_copies > 1) {
-            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
-                    device);
+            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies), device);
             if (!strstr(flaws_str, tmp)) {
                 log_it(tmp);
@@ -482 +491 @@
         amount_allocated += mountlist->el[pos].size / 1024L;
         prev_part_no = curr_part_no;
+        mr_free(device);
     }
 
@@ -499 +509 @@
         mr_free(tmp);
     }
-
-  endoffunc:
-    paranoid_free(device);
 
     if (res) {

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

@@ -3 +3 @@
  */
 
-extern char *build_partition_name(char *partition, const char *drive,
-                                  int partno);
+extern char *build_partition_name(const char *drive, int partno);
 extern void center_string(char *in_out, int width);
 extern char *commarize(char *);

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

@@ -34 +34 @@
  * @param drive The drive basename of the partition name (e.g. /dev/hda)
  * @param partno The partition number (e.g. 1)
- * @param partition Where to put the partition name (e.g. /dev/hda1)
  * @return @p partition.
  * @note If @p drive ends in a digit, then 'p' (on Linux) or 's' (on *BSD) is added before @p partno.
  */
-char *build_partition_name(char *partition, const char *drive, int partno)
-{
-    char *p, *c;
-
-    assert(partition != NULL);
+char *build_partition_name(const char *drive, int partno)
+{
+    char *c = NULL;
+    char *partition = NULL;
+
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0);
 
-    p = strcpy(partition, drive);
+    mr_asprintf(&partition, drive);
     /* is this a devfs device path? */
     c = strrchr(partition, '/');
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup it's devfs, return the "part" path */
+        /* This strcpy is safe */
         strcpy(c + 1, "part");
-        p = c + 5;
     } else {
-        p += strlen(p);
-        if (isdigit(p[-1])) {
-            *p++ =
+        if (isdigit(partition[-1])) {
+            mr_strcat(partition,
 #ifdef BSD
-                's';
+                's');
 #else
-                'p';
+                'p');
 #endif
         }
     }
-    sprintf(p, "%d", partno);
-    return (partition);
-}
-
-
-
-
-
-
-
-
-
-
-
+    mr_strcat(partition, "%d", partno);
+    return(partition);
+}
 
 

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

@@ -3 +3 @@
  */
 
-char *build_partition_name(char *partition, const char *drive, int partno);
+char *build_partition_name(const char *drive, int partno);
 void center_string(char *in_out, int width);
 char *commarize(char *);

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

@@ -42 +42 @@
 extern int openin_tape();
 extern void popup_and_OK(char *);
-extern bool popup_and_get_string(char *, char *, char *, int);
+extern char *popup_and_get_string(char *, char *, char *);
 extern int read_file_from_tape_to_file(char *,
                                        long long);

branches/2.2.10/mondo/src/common/newt-specific-EXT.h

@@ -15 +15 @@
 extern void log_to_screen(const char *fmt, ...);
 extern void popup_and_OK(char *prompt);
-extern bool popup_and_get_string(char *title, char *b, char *output,
-                                 int maxsize);
+extern char *popup_and_get_string(char *title, char *b, char *input);
 extern bool popup_with_buttons(char *p, char *button1, char *button2);
 extern void refresh_log_screen();

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

@@ -358 +358 @@
             log_msg(0, fatalstr);
             log_msg(0, error_string);
-            //      popup_and_OK (error_string);
             newtFinished();
         }
@@ -400 +399 @@
      finish(int signal) {
         char *command = NULL;
-
-        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
-
-        /* newtPopHelpLine(); */
 
         chdir("/");
@@ -750 +745 @@
  * @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 maxsize The size in bytes allocated to @p output.
- * @return TRUE if the user pressed OK, FALSE if they pressed Cancel.
- */
-    bool popup_and_get_string(char *title, char *b, char *output,
-                              int maxsize) {
+ * @param input The string given originaly as default
+ * @return output string if the user pressed OK, NULL if they pressed Cancel.
+ */
+    char *popup_and_get_string(char *title, char *b, char *input) {
 
         /*@ newt ************************************************************ */
@@ -769 +762 @@
 
         /*@ buffers ********************************************************** */
-        char *blurb;
-        char *original_contents;
-
-        blurb = malloc(MAX_NEWT_COMMENT_LEN);
-        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
+        char *blurb = NULL;
+        char *output = NULL;
+
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
-        assert(output != NULL);
 
         if (g_text_mode) {
-            printf
-                ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
-                 title, b);
-            (void) fgets(output, maxsize, stdin);
+            printf("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q--- [%s]\n-->  ", title, b, input);
+            mr_getline(&output, stdin);
+            if (! strcmp(output,"\n")) {
+                /* take default if ENTER was typed */
+                mr_free(output);
+                mr_asprintf(&output, "%s", input);
+            }
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
-            return (TRUE);
-        }
-        strcpy(blurb, b);
+            return (output);
+        }
+
+        mr_asprintf(&blurb, "%s", b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        strcpy(original_contents, output);
-        output[0] = '\0';
         type_here =
             newtEntry(2, newtTextboxGetNumLines(text) + 2,
-                      original_contents, 50,
+                      input, 50,
 #ifdef __cplusplus
                       0, NEWT_FLAG_RETURNEXIT
@@ -804 +794 @@
         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
         b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
-        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
         newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
         myForm = newtForm(NULL, NULL, 0);
@@ -811 +800 @@
         newtPushHelpLine(blurb);
         b_res = newtRunForm(myForm);
-        strcpy(output, entry_value);
+
+        if (b_res == b_1) {
+            mr_asprintf(&output, "%s", newtEntryGetValue(type_here));
+        }
         newtPopHelpLine();
         newtFormDestroy(myForm);
         newtPopWindow();
-        if (b_res == b_2) {
-            strcpy(output, original_contents);
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
-            return (FALSE);
-        } else {
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
-            return (TRUE);
-        }
+        mr_free(blurb);
+
+        return (output);
     }
 
@@ -1179 +1164 @@
         } else {
             mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
-            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
+            mr_asprintf(&percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
             center_string(blurb1, 54);

branches/2.2.10/mondo/src/common/newt-specific.h

@@ -21 +21 @@
                         long max_val);
 void popup_and_OK(char *prompt);
-bool popup_and_get_string(char *title, char *b, char *output, int maxsize);
+char *popup_and_get_string(char *title, char *b, char *input);
 bool popup_with_buttons(char *p, char *button1, char *button2);
 void refresh_log_screen();

branches/2.2.10/mondo/src/include/mr_mem.h

@@ -20 +20 @@
 #define mr_allocstr(x,y) mr_allocstr_int(x,y,__LINE__,__FILE__)
 #define mr_asprintf(x,y,args...) mr_asprintf_int(x,__LINE__,__FILE__,y,## args)
-#define mr_getline(x,y,z) mr_getline_int(x,y,z,__LINE__,__FILE__)
+#define mr_getline(x,z) mr_getline_int(x,z,__LINE__,__FILE__)
 #define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
 #define mr_setenv(x,y) mr_setenv_int(x,y,__LINE__,__FILE__)
@@ -30 +30 @@
 extern inline void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
 extern inline void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
-extern inline void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, char *file);
+extern inline void mr_getline_int(char **lineptr, FILE *stream, int line, char *file);
 extern inline void *mr_malloc_int(size_t size, int line, char *file);
 extern inline void mr_setenv_int(const char *name, const char *value, int line, char *file);

branches/2.2.10/mondo/src/lib/mr_mem.c

@@ -54 +54 @@
 
 /* encapsulation function for getline */
-void mr_getline_int(char **lineptr, size_t *n, FILE *fd, int line, const char *file) {
+void mr_getline_int(char **lineptr, FILE *fd, int line, const char *file) {
     
     ssize_t ret;
+    ssize_t *n;
 
     ret = getline(lineptr,n,fd);

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

@@ -1457 +1457 @@
 
     /** buffers *********************************************************/
-    char *device_str;
+    char *device_str = NULL;
     char *format;
     char *tmp = NULL;
@@ -1466 +1466 @@
     assert_string_is_neither_NULL_nor_zerolength(drivename);
 
-    malloc_string(device_str);
     malloc_string(format);
 
@@ -1483 +1482 @@
     if (!pout_to_fdisk) {
         log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
-        paranoid_free(device_str);
         paranoid_free(format);
         return (1);
@@ -1489 +1487 @@
 #endif
     for (current_devno = 1; current_devno < 99; current_devno++) {
-        build_partition_name(device_str, drivename, current_devno);
+        device_str = build_partition_name(drivename, current_devno);
         lino = find_device_in_mountlist(mountlist, device_str);
 
@@ -1518 +1516 @@
                     }
                     mr_free(command);
-                    paranoid_free(device_str);
+                    mr_free(device_str);
                     paranoid_free(format);
                     return r;
@@ -1547 +1545 @@
                 }
             } else {
+                mr_free(device_str);
                 continue;
             }
 #else
+            mr_free(device_str);
             continue;
 #endif
@@ -1606 +1606 @@
             log_to_screen
                 ("You must leave at least one partition spare as the Extended partition.");
-            paranoid_free(device_str);
+            mr_free(device_str);
             paranoid_free(format);
             return (1);
@@ -1627 +1627 @@
         }
 #endif
+        mr_free(device_str);
 
         previous_devno = current_devno;
@@ -1666 +1667 @@
         }
     }
-    paranoid_free(device_str);
     paranoid_free(format);
     return (retval);
@@ -1690 +1690 @@
     /** buffers **********************************************************/
     char *program = NULL;
-    char *partition_name;
+    char *partition_name = NULL;
     char *tmp = NULL;
     char *output = NULL;
@@ -1701 +1701 @@
     /** end ***************************************************************/
 
-    malloc_string(partition_name);
-
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(format != NULL);
@@ -1714 +1712 @@
         mr_free(tmp);
 
-        paranoid_free(partition_name);
         return (0);
     }
-    build_partition_name(partition_name, drive, partno);
+    partition_name = build_partition_name(drive, partno);
     if (partsize <= 0) {
         mr_asprintf(&tmp, "Partitioning device %s (max size)", partition_name);
@@ -1731 +1728 @@
         log_to_screen(tmp);
         mr_free(tmp);
-        paranoid_free(partition_name);
+        mr_free(partition_name);
         return (1);
     }
@@ -1749 +1746 @@
             if (partno == 5) {
                 if (prev_partno >= 4) {
-                    log_to_screen
-                        ("You need to leave at least one partition free, for 'extended/logical'");
-                    paranoid_free(partition_name);
+                    log_to_screen("You need to leave at least one partition free, for 'extended/logical'");
+                    mr_free(partition_name);
                     paranoid_free(output);
                     return (1);
@@ -1776 +1772 @@
     log_it(tmp);
     mr_free(tmp);
+
     log_it("---fdisk command---");
     log_it(output);
@@ -1867 +1864 @@
     }
     mr_free(program);
+    mr_free(partition_name);
     paranoid_free(output);
 
     g_current_progress++;
     log_it("partition_device() --- leaving");
-    paranoid_free(partition_name);
     return (retval);
 }
@@ -1979 +1976 @@
 {
     /** buffers *********************************************************/
-    char *partition;
+    char *partition = NULL;
     char *command = NULL;
     char *output = NULL;
     char *tmp = NULL;
-    char *partcode;
+    char *partcode = NULL;
 
     /** pointers *********************************************************/
@@ -1997 +1994 @@
     assert(format != NULL);
 
-    malloc_string(partition);
-    malloc_string(partcode);
-
-    build_partition_name(partition, drive, partno);
+    partition = build_partition_name(drive, partno);
     p = (char *) strrchr(partition, '/');
     if (strcmp(format, "swap") == 0) {
-        strcpy(partcode, "82");
+        mr_asprintf(&partcode, "82");
     } else if (strcmp(format, "vfat") == 0) {
         if (partsize / 1024 > 8192) {
-            strcpy(partcode, "c");
+            mr_asprintf(&partcode, "c");
         } else {
-            strcpy(partcode, "b");
+            mr_asprintf(&partcode, "b");
         }
     } else if (strcmp(format, "ext2") == 0
@@ -2016 +2010 @@
                || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
-        strcpy(partcode, "83");
+        mr_asprintf(&partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
-        strcpy(partcode, "81");
+        mr_asprintf(&partcode, "81");
     } else if (strcmp(format, "vmfs3") == 0) {
-        strcpy(partcode, "fb");
+        mr_asprintf(&partcode, "fb");
     } else if (strcmp(format, "vmkcore") == 0) {
-        strcpy(partcode, "fc");
+        mr_asprintf(&partcode, "fc");
     } else if (strcmp(format, "raid") == 0) {
-        strcpy(partcode, "fd");
+        mr_asprintf(&partcode, "fd");
     } else if (strcmp(format, "ntfs") == 0) {
-        strcpy(partcode, "7");
+        mr_asprintf(&partcode, "7");
     } else if ((strcmp(format, "ufs") == 0)
                || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
-        strcpy(partcode, "a5");
+        mr_asprintf(&partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
-        strcpy(partcode, "8e");
+        mr_asprintf(&partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        partcode[0] = '\0';
+        mr_asprintf(&partcode, "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-        strcpy(partcode, format);
+        mr_asprintf(&partcode, format);
     } else {
         /* probably an image */
@@ -2042 +2036 @@
         mr_free(tmp);
 #ifdef __FreeBSD__
-        strcpy(partcode, format);   // was a5
+        mr_asprintf(&partcode, format); // was a5
 #else
-        strcpy(partcode, format);   // was 83
+        mr_asprintf(&partcode, format); // was 83
 #endif
     }
     log_msg(1, tmp, "Setting %s's type to %s (%s)", partition, format, partcode);
-    if (partcode[0] != '\0' && strcmp(partcode, "83")) {    /* no need to set type if 83: 83 is default */
+    mr_free(partition);
+
+    if (partcode != NULL && strcmp(partcode, "83")) {   /* no need to set type if 83: 83 is default */
 
         if (pout_to_fdisk) {
@@ -2104 +2100 @@
     }
 
-    paranoid_free(partition);
-    paranoid_free(partcode);
-
+    mr_free(partcode);
     return (res);
 }

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

@@ -12 +12 @@
 #include "mondo-rstr-newt.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 
 //static char cvsid[] = "$Id$";
@@ -255 +256 @@
 {
 
-    /** buffers ***********************************************************/
-    char sz_out[MAX_STR_LEN];
-
     /** int ****************************************************************/
     int items = 0;
     int i = 0;
 
+    char *p = NULL;
+
     assert(raidrec != NULL);
 
-    sz_out[0] = '\0';
-    if (popup_and_get_string
-        ("Add variable", "Enter the name of the variable to add", sz_out,
-         MAX_STR_LEN)) {
-        strip_spaces(sz_out);
+    p = popup_and_get_string("Add variable", "Enter the name of the variable to add", "");
+    if (p != NULL) {
+        mr_strip_spaces(p);
         items = raidrec->additional_vars.entries;
         for (i = 0;
              i < items
-             && strcmp(raidrec->additional_vars.el[i].label, sz_out); i++);
+             && strcmp(raidrec->additional_vars.el[i].label, p); i++);
         if (i < items) {
             popup_and_OK
                 ("No need to add that variable. It is already listed here.");
         } else {
-            strcpy(raidrec->additional_vars.el[items].label, sz_out);
+            strcpy(raidrec->additional_vars.el[items].label, p);
             edit_varslist_entry(raidrec, items);
             raidrec->additional_vars.entries = ++items;
         }
     }
+    mr_free(p);
 }
 #endif
@@ -464 +463 @@
 
     /** int ***************************************************************/
-    int res = 0;
     int out = 0;
+    int i = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *p = NULL;
+    char *q = NULL;
     char *prompt = NULL;
-    char *sz = NULL;
 
     mr_asprintf(&prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        strcpy(tmp, "concat");
+        mr_asprintf(&tmp, "concat");
     } else if (raidrec->raidlevel == 0) {
-        strcpy(tmp, "striped");
+        mr_asprintf(&tmp, "striped");
     } else {
-        sprintf(tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(&tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
-        if (!res) {
+        p = popup_and_get_string("Specify RAID level", prompt, tmp);
+        if (p == NULL) {
+            mr_free(tmp);
+            mr_free(prompt);
             mr_free(prompt);
             return;
         }
-        strip_spaces(tmp);
-        if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            mr_asprintf(&sz, "%s", tmp);
-            strncpy(tmp, sz + 1, strlen(sz) - 2);
-            tmp[strlen(sz) - 2] = '\0';
+        mr_strip_spaces(p);
+        /* Suppress brakets at each hend */
+        if (p[0] == '[' && p[strlen(p) - 1] == ']') {
+            q = p+1;
+            i = 0;
+            while (*q != ']') {
+                p[i] = *q;
+                i++;
+                q++;
+            }
+            p[i] = '\0';
             mr_free(sz);
         }
-        if (!strcmp(tmp, "concat")) {
+        if (!strcmp(p, "concat")) {
             out = -1;
-        } else if (!strcmp(tmp, "striped")) {
+        } else if (!strcmp(p, "striped")) {
             out = 0;
-        } else if (!strcmp(tmp, "raid5")) {
+        } else if (!strcmp(p, "raid5")) {
             out = 5;
         }
-        log_it(tmp);
+        log_it("Raid level : %s",p);
+        mr_free(p);
+
         if (is_this_raid_personality_registered(out)) {
-            log_it
-                ("Groovy. You've picked a RAID personality which is registered.");
+            log_it("Groovy. You've picked a RAID personality which is registered.");
         } else {
-            if (ask_me_yes_or_no
-                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
+            if (ask_me_yes_or_no("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
             {
                 out = 999;
@@ -512 +520 @@
         }
     }
+    mr_free(tmp);
     mr_free(prompt);
+
     raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *personalities = NULL;
     char *prompt = NULL;
-    char *sz = NULL;
-    int out = 0, res = 0;
+    char *p = NULL;
+    char *q = NULL;
+    int out = 0;
+    int i = 0;
 
 
     assert(raidrec != NULL);
-    system
-        ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
+
+    system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
     mr_asprintf(&personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
     mr_asprintf(&prompt, "Please enter the RAID level you want. %s", personalities);
@@ -531 +543 @@
 
     if (raidrec->raid_level == -1) {
-        strcpy(tmp, "linear");
+        mr_asprintf(&tmp, "linear");
     } else {
-        sprintf(tmp, "%d", raidrec->raid_level);
+        mr_asprintf(&tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
          out != -1 && out != 0 && out != 1 && out != 4 && out != 5
          && out != 10;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
-        if (!res) {
+        p = popup_and_get_string("Specify RAID level", prompt, tmp);
+
+        if (p == NULL) {
+            mr_free(tmp);
+            mr_free(prompt);
             mr_free(prompt);
             return;
         }
-        strip_spaces(tmp);
-        if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            mr_asprintf(&sz, "%s", tmp);
-            strncpy(tmp, sz + 1, strlen(sz) - 2);
-            tmp[strlen(sz) - 2] = '\0';
+        mr_strip_spaces(p);
+        if (p[0] == '[' && p[strlen(p) - 1] == ']') {
+            q = p+1;
+            i = 0;
+            while (*q != ']') {
+                p[i] = *q;
+                i++;
+                q++;
+            }
+            p[i] = '\0';
             mr_free(sz);
         }
-        if (!strcmp(tmp, "linear")) {
+        if (!strcmp(p, "linear")) {
             out = -1;
-        } else if (!strncmp(tmp, "raid", 4)) {
-            out = atoi(tmp + 4);
+        } else if (!strncmp(p, "raid", 4)) {
+            out = atoi(p + 4);
         } else {
-            out = atoi(tmp);
-        }
-        log_it(tmp);
+            out = atoi(p);
+        }
+        log_it("Raid level : %s",p);
         if (is_this_raid_personality_registered(out)) {
-            log_it
-                ("Groovy. You've picked a RAID personality which is registered.");
+            log_it("Groovy. You've picked a RAID personality which is registered.");
         } else {
-            if (ask_me_yes_or_no
-                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
-            {
+            if (ask_me_yes_or_no("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")) {
                 out = 999;
             }
         }
     }
+    mr_free(tmp);
     mr_free(prompt);
     raidrec->raid_level = out;
@@ -1696 +1714 @@
     int currline_a, currline_u;
 
+    char *p = NULL;
+
     struct mountlist_itself *unallocparts;
 
@@ -1828 +1848 @@
             choose_raid_level(raidrec);
         } else if (b_res == bStripeSize) {
-            char tmp[64];
-            sprintf(tmp, "%i", raidrec->stripesize);
-            if (popup_and_get_string
-                ("Stripe size",
-                 "Please enter the stripe size in kilobytes.", tmp, 20)) {
-                raidrec->stripesize = atoi(tmp);
+            char *tmp = NULL;
+
+            mr_asprintf(&tmp, "%i", raidrec->stripesize);
+            p = popup_and_get_string("Stripe size", "Please enter the stripe size in kilobytes.", tmp);
+            mr_free(tmp);
+
+            if (p != NULL) {
+                raidrec->stripesize = atoi(p);
             }
+            mr_free(p);
         } else if ((b_res == bAlloc) || (b_res == unallocListbox)) {
             if (currline_u <= unallocparts->entries)
@@ -1868 +1891 @@
 
     /** buffers ***********************************************************/
-    char header[MAX_STR_LEN];
-    char comment[MAX_STR_LEN];
-    char sz_out[MAX_STR_LEN];
+    char *header = NULL;
+    char *comment = NULL;
+    char *sz_out = NULL;
+    char *p = NULL;
 
     assert(raidrec != 0);
     assert(lino >= 0);
 
-    strcpy(sz_out, raidrec->additional_vars.el[lino].value);
-    sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
-    sprintf(comment, "Please set %s's value (currently '%s')",
-            raidrec->additional_vars.el[lino].label, sz_out);
-    if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
-        strip_spaces(sz_out);
-        strcpy(raidrec->additional_vars.el[lino].value, sz_out);
-    }
+    mr_asprintf(&sz_out, "%s", raidrec->additional_vars.el[lino].value);
+    mr_asprintf(&header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    mr_asprintf(&comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
+    p = popup_and_get_string(header, comment, sz_out);
+    if (p != NULL) {
+        mr_strip_spaces(p);
+        strcpy(raidrec->additional_vars.el[lino].value, p);
+    }
+    mr_free(p);
 }
 
@@ -2242 +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;
+    char *q = NULL;
+    char *r = NULL;
+    char *idev = NULL;
+    bool ret = FALSE;       /* Should be false by default, and modfiy if conditions respected */
 
     /** initialize ********************************************************/
 
     assert(isodir_device != NULL);
-    assert(isodir_format != NULL);
     assert(isodir_path != NULL);
 
     log_it("isodir_path = %s", isodir_path);
-    isodir_format[0] = '\0';
     if (isodir_device[0] == '\0') {
-        strcpy(isodir_device, "/dev/");
-    }
+        mr_asprintf(&idev, "/dev/");
+    } else {
+        mr_asprintf(&idev, "%s", isodir_device);
+    }
+
     if (isodir_path[0] == '\0') {
         strcpy(isodir_path, "/");
     }
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
-        strcpy(isodir_device, last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
-        strcpy(isodir_format, "nfs");
+        mr_free(idev);
+        mr_asprintf(&idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        mr_asprintf(&isodir_format, "nfs");
         strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
     }
+
+    /* modify for the caller */
+    strcpy(isodir_device, idev);
     if (nuke_me_please) {
-        return (TRUE);
-    }
-
-    if (popup_and_get_string
-        ("ISO Mode - device", "On what device do the ISO files live?",
-         isodir_device, MAX_STR_LEN / 4)) {
-        if (popup_and_get_string
-            ("ISO Mode - format",
-             "What is the disk format of the device? (Hit ENTER if you don't know.)",
-             isodir_format, 16)) {
-            if (popup_and_get_string
-                ("ISO Mode - path",
-                 "At what path on this device can the ISO files be found?",
-                 isodir_path, MAX_STR_LEN / 4)) {
-                strip_spaces(isodir_device);
-                strip_spaces(isodir_format);
-                strip_spaces(isodir_path);
-                log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path);
-                return (TRUE);
+        ret = TRUE;
+    } else {
+        p = popup_and_get_string("ISO Mode - device", "On what device do the ISO files live?", idev);
+        if (p != NULL) {
+            q = popup_and_get_string("ISO Mode - format", "What is the disk format of the device? (Hit ENTER if you don't know.)", isodir_format);
+            mr_free(isodir_format);
+    
+            if (q != NULL) {
+                r = popup_and_get_string("ISO Mode - path", "At what path on this device can the ISO files be found?", isodir_path);
+                if (r != NULL) {
+                    mr_strip_spaces(p);
+                    mr_strip_spaces(q);
+                    mr_strip_spaces(r);
+
+                    isodir_format = q;
+    
+                    /* modify for the caller */
+                    strcpy(isodir_device, p);
+                    strcpy(isodir_path, r);
+                    log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path);
+                    mr_free(r);
+    
+                    ret = TRUE;
+                }
             }
         }
-    }
-    return (FALSE);
+        mr_free(p);
+    }
+    mr_free(idev);
+    mr_free(isodir_format);
+    return(ret);
 }
 
@@ -2700 +2742 @@
     /** buffers **********************************************************/
     void *keylist[ARBITRARY_MAXIMUM];
-    char *tmp;
-    char *help_text;
-    char *title_of_window;
-    char *sz_res;
-    char *header_text;
+    char *tmp = NULL;
+    char *help_text = NULL;
+    char *title_of_window = NULL;
+    char *sz_res = NULL;
+    char *header_text = NULL;
+    char *p = NULL;
 
   /** int **************************************************************/
@@ -2717 +2760 @@
 
     log_it("malloc'ing");
-    malloc_string(tmp);
-    malloc_string(help_text);
-    malloc_string(title_of_window);
-    malloc_string(sz_res);
-    malloc_string(header_text);
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
-    if (!(bkp_disklist = malloc(sizeof(struct list_of_disks)))) {
-        fatal_error("Cannot malloc space for disklist");
-    }
-    if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc space for raidlist");
-    }
-    if (!
-        (unallocated_raid_partitions =
-         malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc space for unallocated_raid_partitions");
-    }
-
-    memcpy((void *) bkp_raidlist, (void *) raidlist,
-           sizeof(struct raidlist_itself));
-    memcpy((void *) bkp_raidrec, (void *) raidrec,
-           sizeof(struct raid_device_record));
-    memcpy((void *) bkp_disklist, (void *) disklist,
-           sizeof(struct list_of_disks));
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
+    bkp_disklist = mr_malloc(sizeof(struct list_of_disks));
+    bkp_raidlist = mr_malloc(sizeof(struct raidlist_itself));
+    unallocated_raid_partitions = mr_malloc(sizeof(struct mountlist_itself));
+
+    memcpy((void *) bkp_raidlist, (void *) raidlist, sizeof(struct raidlist_itself));
+    memcpy((void *) bkp_raidrec, (void *) raidrec, sizeof(struct raid_device_record));
+    memcpy((void *) bkp_disklist, (void *) disklist, sizeof(struct list_of_disks));
 
     log_it("Post-malloc");
-    strcpy(help_text,
-           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-    sprintf(header_text, "%-24s    %s", "Device", "Index");
-    sprintf(title_of_window, "%s contains...", raidrec->raid_device);
+    mr_asprintf(&help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    mr_asprintf(&header_text, "%-24s    %s", "Device", "Index");
+    mr_asprintf(&title_of_window, "%s contains...", raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2803 +2827 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    sprintf(tmp, "%s's index is %d. What should it be?",
-                            raidrec->raid_device,
-                            disklist->el[currline].index);
-                    sprintf(sz_res, "%d", disklist->el[currline].index);
-                    if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
+                    mr_asprintf(&tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
+                    mr_asprintf(&sz_res, "%d", disklist->el[currline].index);
+                    p = popup_and_get_string("Set index", tmp, sz_res);
+                    mr_free(tmp);
+                    if (p != NULL) {
                         disklist->el[currline].index = atoi(sz_res);
                     }
                     redraw_disklist(disklist, keylist, partitionsListbox);
+                    mr_free(sz_res);
                 }
             }
@@ -2818 +2843 @@
     }
     newtPopHelpLine();
+    mr_free(help_text);
+    mr_free(header_text);
+    mr_free(title_of_window);
+
     if (b_res == bCancel) {
-        memcpy((void *) raidlist, (void *) bkp_raidlist,
-               sizeof(struct raidlist_itself));
-        memcpy((void *) raidrec, (void *) bkp_raidrec,
-               sizeof(struct raid_device_record));
-        memcpy((void *) disklist, (void *) bkp_disklist,
-               sizeof(struct list_of_disks));
-    }
-    paranoid_free(tmp);
-    paranoid_free(help_text);
-    paranoid_free(title_of_window);
-    paranoid_free(sz_res);
-    paranoid_free(header_text);
-    paranoid_free(bkp_raidrec);
-    paranoid_free(bkp_disklist);
-    paranoid_free(bkp_raidlist);
-    paranoid_free(unallocated_raid_partitions);
+        memcpy((void *) raidlist, (void *) bkp_raidlist, sizeof(struct raidlist_itself));
+        memcpy((void *) raidrec, (void *) bkp_raidrec, sizeof(struct raid_device_record));
+        memcpy((void *) disklist, (void *) bkp_disklist, sizeof(struct list_of_disks));
+    }
+    mr_free(bkp_raidrec);
+    mr_free(bkp_disklist);
+    mr_free(bkp_raidlist);
+    mr_free(unallocated_raid_partitions);
 }
 #endif

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

@@ -159 +159 @@
 void open_progress_form(char *, char *, char *, char *, long);
 void popup_and_OK(char *);
-bool popup_and_get_string(char *, char *, char *, int);
+char *popup_and_get_string(char *, char *, char *);
 bool popup_with_buttons(char *, char *, char *);
 void redraw_disklist(struct list_of_disks *, void *keylist[],

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

@@ -42 +42 @@
 */
 extern char *g_isodir_device;
-extern char *g_isodir_format;
 extern long g_current_progress, g_maximum_progress;
 extern char *g_biggielist_txt;  // where 'biggielist.txt' is stored, on ramdisk / tempdir;
@@ -96 +95 @@
 */
 paranoid_free(g_isodir_device);
-paranoid_free(g_isodir_format);
 
 }
@@ -264 +262 @@
     int retval = 0, i;
     bool already_mounted = FALSE;
+    char *isodir_format = NULL;
 
 assert(bkpinfo != NULL);
@@ -281 +280 @@
 }
 
-if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {
+if (!get_isodir_info(g_isodir_device, isodir_format, bkpinfo->isodir, nuke_me_please)) {
+    mr_free(isodir_format);
     return (1);
 }
@@ -291 +291 @@
 } else {
     mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
-    if (strlen(g_isodir_format) > 1) {
-        mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
-    }
+    if (isodir_format) {
+        mr_strcat(mount_isodir_command, " -t %s", isodir_format);
+    }
+
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
     run_program_and_log_output("df -m", FALSE);
@@ -308 +309 @@
     ("I have mounted the device where the ISO files are stored.");
 }
+mr_free(isodir_format);
+
 if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
     mount_media();
@@ -1426 +1429 @@
   /** malloc **/
     char *command = NULL;
-    char *boot_device;
+    char *boot_device = NULL;
     char *rootdev;
     char *rootdrive;
@@ -1432 +1435 @@
     char *tmp = NULL;
     char *editor;
-
-    int res;
-    int done;
-
-    malloc_string(boot_device);
+    char *p = NULL;
+
+    int res = 0;
+    bool done;
+
     malloc_string(editor);
     malloc_string(rootdev);
@@ -1443 +1446 @@
     assert_string_is_neither_NULL_nor_zerolength(bd);
     strcpy(editor, find_my_editor());
-    strcpy(boot_device, bd);
+    mr_asprintf(&boot_device, "%s", bd);
 
     if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY,
                             0,
                             "Modifying fstab, mtab, device.map and menu.lst, and running GRUB...                             ");
         for (done = FALSE; !done;) {
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            mr_asprintf(&command, "stabgrub-me %s", boot_device);
+            p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
+            if (p == NULL) {
+                done = TRUE;
+                mr_free(p);
+                /* we want some warnings later on */
+                res = 1;
+                continue;
+            }
+            mr_asprintf(&command, "stabgrub-me %s", p);
+            mr_free(p);
+
             res = run_program_and_log_output(command, 1);
             mr_free(command);
@@ -1494 +1503 @@
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
@@ -1521 +1529 @@
         }
     }
+    mr_free(boot_device);
+
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
@@ -1540 +1550 @@
     paranoid_free(rootdrive);
     paranoid_free(conffile);
-    paranoid_free(boot_device);
     paranoid_free(editor);
 
@@ -1744 +1753 @@
   /** malloc **/
     char *command = NULL;
-    char *boot_device;
+    char *boot_device = NULL;
     char *tmp = NULL;
     char *editor;
+    char *p = NULL;
     int res;
     int done;
 
-    malloc_string(boot_device);
     malloc_string(editor);
     assert_string_is_neither_NULL_nor_zerolength(bd);
 
     strcpy(editor, find_my_editor());
-    strcpy(boot_device, bd);
+    mr_asprintf(&boot_device, "%s", bd);
 
     if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY, 0,
                             "Modifying fstab and restoring MBR...                           ");
@@ -1776 +1784 @@
                 }
             }
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            mr_asprintf(&command, "stabraw-me %s", boot_device);
+            p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
+            if (p == NULL) {
+                done = TRUE;
+                mr_free(p);
+                /* we want some warnings later on */
+                res = 1;
+                continue;
+            }
+            mr_asprintf(&command, "stabraw-me %s", p);
+            mr_free(p);
+
             res = run_program_and_log_output(command, 3);
             mr_free(command);
@@ -1789 +1804 @@
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
         mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
@@ -1800 +1814 @@
         mr_free(command);
     }
+    mr_free(boot_device);
 
     if (res) {
@@ -1808 +1823 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(boot_device);
     paranoid_free(editor);
     return (res);
@@ -1839 +1853 @@
     malloc_string(g_mondo_home);
     malloc_string(g_isodir_device);
-    malloc_string(g_isodir_format);
 
     temppath = bkpinfo->tmpdir;

branches/2.2.10/mondo/src/mondorestore/mondoprep.h

@@ -33 +33 @@
 extern void close_progress_form(void);
 extern void popup_and_OK(char *);
-extern bool popup_and_get_string(char *, char *, char *, int);
+extern char *popup_and_get_string(char *, char *, char *);
 extern long get_time(void);
 extern bool is_this_device_mounted(char *);

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

@@ -439 +439 @@
   /** needs malloc **********/
     char *tmp;
+    char *p = NULL;
     char *tmp1 = NULL;
     char *fstab_fname;
@@ -470 +471 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     log_it("Done loading config file; resizing ML");
-    if (bkpinfo->backup_media_type == nfs) {
-        strcpy(tmp, bkpinfo->prefix);
-        if (popup_and_get_string
-            ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
-            strcpy(bkpinfo->prefix, tmp);
-            log_msg(1, "Prefix set to %s",bkpinfo->prefix);
-        }
-    }
 
 #ifdef __FreeBSD__
@@ -607 +600 @@
               gotos_suck:
                 strcpy(tmp, old_restpath);
-// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
-                if (popup_and_get_string
-                    ("Restore path", "Restore files to where?", tmp,
-                     MAX_STR_LEN / 4)) {
+                // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
+                p = popup_and_get_string("Restore path", "Restore files to where?", tmp);
+                if (p != NULL) {
+                    strcpy(tmp, p);
                     if (!strcmp(tmp, "/")) {
                         if (!ask_me_yes_or_no("Are you sure?")) {
@@ -625 +618 @@
                     free_filelist(filelist);
                 }
+                mr_free(p);
+
                 if (!ask_me_yes_or_no
                     ("Restore another subset of your backup?")) {
@@ -952 +947 @@
   /** malloc **/
     char *old_restpath;
+    char *p = NULL;
 
     struct mountlist_itself *mountlist = NULL;
@@ -997 +993 @@
         save_filelist(filelist, "/tmp/selected-files.txt");
         strcpy(old_restpath, bkpinfo->restore_path);
-        if (popup_and_get_string("Restore path",
-                                 "Restore files to where? )",
-                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
+        p = popup_and_get_string("Restore path", "Restore files to where? )", bkpinfo->restore_path);
+        if (p != NULL) {
+            strcpy(bkpinfo->restore_path, p);
+            mr_free(p);
+
             log_it("Restoring everything");
             retval += restore_everything(filelist);

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

@@ -59 +59 @@
 extern int partition_everything(struct mountlist_itself *);
 extern void popup_and_OK(char *);
-extern bool popup_and_get_string(char *, char *, char *, int);
+extern char *popup_and_get_string(char *, char *, char *);
 extern void setup_newt_stuff(void);
 extern void reset_bkpinfo();

branches/2.2.10/tools/quality

@@ -49 +49 @@
 cat /tmp/mondo.quality
 echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` mr_asprintf without \""
+find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -rw mr_getline | egrep -v '/\*' | egrep -v 'mr_getline\(&' > /tmp/mondo.quality
+cat /tmp/mondo.quality
+echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` mr_getline without &"
+
 echo " "
 echo "Splint: "