Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

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

Author:

Bruno Cornec

Message:

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

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

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (6 diffs)

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

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