Changeset 171 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-restore.c

Timestamp:

Dec 8, 2005, 5:20:29 PM (18 years ago)

Author:

bcornec

Message:

memory management continues:

• mondoarchive handled completely
• bkpinfo, begining of dyn. alloc.
• lot of changes around memory everywhere

=> even if it compiles, i'm pretty sure it doesn't work yet (even not tried)

File:

• trunk/mondo/mondo/mondorestore/mondo-restore.c (modified) (3 diffs)

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

@@ -1292 +1292 @@
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
-    if (!bkpinfo->media_device[0]) {
+    if (bkpinfo->media_device == NULL) {
         log_msg(2, "Warning - failed to find media dev");
+    } else {
+        log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     }
 
@@ -1330 +1331 @@
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    if (!bkpinfo->please_dont_eject) {
+    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device != NULL)) {
         eject_device(bkpinfo->media_device);
     }
@@ -3100 +3101 @@
     unlink(datadisks_fname);
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
-    retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
+    retval = load_mountlist(&the_mountlist, g_mountlist_fname);