Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -131 +131 @@
     mr_free(tmp);
 
-    if (is_this_a_ramdisk) {
-        if (!does_file_exist("/THIS-IS-A-RAMDISK")) {
-            log_to_screen("Using /dev/root is stupid of you but I'll forgive you.");
-            is_this_a_ramdisk = FALSE;
-        }
-    }
-    if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-        is_this_a_ramdisk = TRUE;
-    }
     log_msg(1, "Is this a ramdisk? result = %s", (is_this_a_ramdisk) ? "TRUE" : "FALSE");
     return (is_this_a_ramdisk);
@@ -515 +506 @@
 
     if (g_cdrw_drive_is_here[0]) {
-        mr_asprintf(cdrw_device, g_cdrw_drive_is_here);
+        mr_asprintf(cdrw_device, "%s", g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
         return(cdrw_device);
@@ -840 +831 @@
 
     if (g_dvd_drive_is_here[0]) {
-        mr_asprintf(output, g_dvd_drive_is_here);
+        mr_asprintf(output, "%s", g_dvd_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
         return (output);
@@ -1599 +1590 @@
 
         mr_free(bkpinfo->media_device);
-        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = find_tape_device_and_size(NULL)) == NULL)) {
+        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = mr_find_tape_device()) == NULL)) {
             log_msg(3, "Ok, using vanilla scsi tape.");
             mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);
@@ -1641 +1632 @@
         mr_free(tmp);
 
-        bkpinfo->use_obdr = ask_me_yes_or_no
-            ("Do you want to activate OBDR support for your tapes ?");
+        bkpinfo->use_obdr = ask_me_yes_or_no("Do you want to activate OBDR support for your tapes ?");
         bkpinfo->media_size[0] = 0;
         log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);