Changeset 2316 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

Aug 18, 2009, 2:34:29 PM (16 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/mondo/src/common

Files:

• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (26 diffs)
• libmondo-files.c (modified) (2 diffs)
• libmondo-fork.c (modified) (2 diffs)
• libmondo-mountlist.c (modified) (13 diffs)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (1 diff)
• libmondo-string.h (modified) (1 diff)
• libmondo-verify.h (modified) (1 diff)
• newt-specific-EXT.h (modified) (1 diff)
• newt-specific.c (modified) (7 diffs)
• newt-specific.h (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();