Changeset 2306 in MondoRescue

Timestamp:

Jul 27, 2009, 7:50:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

• popup_and_get_string needs an allocated buffer for the moment so fixing the calls with dyn. ones
• Fix a bug in mem.c for mr_strcat, which wasn't modifying the right pointer level

Ported from 2.2.9

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-devices.c (modified) (7 diffs)
• common/libmondo-mountlist.c (modified) (1 diff)
• lib/mr_mem.c (modified) (1 diff)

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

@@ -1445 +1445 @@
 {
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
@@ -1455 +1456 @@
     malloc_string(prompt);
     malloc_string(sz_size);
+    malloc_string(tmp1);
     assert(bkpinfo != NULL);
     bkpinfo->nonbootable_backup = FALSE;
@@ -1511 +1513 @@
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
-                mr_asprintf(&tmp, "1");
+                strcpy(tmp1, "1");
                 sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
-                mr_asprintf(&tmp, "4");
+                strcpy(tmp1, "4");
                 sprintf(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, tmp, 4)) {
+                if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
                     log_to_screen("User has chosen not to backup the PC");
                     mr_free(comment);
@@ -1529 +1531 @@
             mr_free(comment);
 
-            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
-            mr_free(tmp);
+            bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
 
             mr_asprintf(&comment, "How much data (in Megabytes) will each %s store?", mds);
@@ -1794 +1795 @@
             finish(1);
         }
-        mr_asprintf(&tmp, "%s", bkpinfo->nfs_remote_dir);
+        strcpy(tmp1, bkpinfo->nfs_remote_dir);
         if (!popup_and_get_string
-            ("Directory", "Which directory within that mountpoint?", tmp,
+            ("Directory", "Which directory within that mountpoint?", tmp1,
              MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        strcpy(bkpinfo->nfs_remote_dir, tmp);
-        mr_free(tmp);
+        strcpy(bkpinfo->nfs_remote_dir, tmp1);
 
         // check whether writable - we better remove surrounding spaces for this
@@ -1946 +1946 @@
         mr_free(tmp);
 // NTFS 
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
-        if (strlen(tmp) > 2) {
+        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.",
-                 tmp, MAX_STR_LEN / 4)) {
+                 tmp1, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            strncpy(bkpinfo->image_devs, tmp, MAX_STR_LEN / 4);
-        }
-        mr_free(tmp);
+            strncpy(bkpinfo->image_devs, tmp1, MAX_STR_LEN / 4);
+        }
 
 
@@ -2049 +2048 @@
     }
     paranoid_free(sz_size);
+    paranoid_free(tmp1);
     paranoid_free(prompt);
     return (0);

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

@@ -559 +559 @@
         } else {
             log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
-            if ((tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device)) == NULL) {
+            tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
+            if (tmp == NULL) {
                 res++;
             }
         }
         log_msg(8,"Entry: %d (%s)", i, drivelist->el[i].device);
-        /* BCO: tmp can be NULL as well as flaws_str */
+        /* BCO: tmp can be NULL */
         if (tmp != NULL) {
             log_msg(8,"Adding: %s to %s", tmp, flaws_str);

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

@@ -141 +141 @@
         mr_free_int((void **)&fmt2,line,file);
         mr_free_int((void **)in,line,file);
-        *in = p;
+        in = &p;
     }
     va_end(args);