Changeset 3872 in MondoRescue

Timestamp:

Mar 7, 2024, 7:00:38 PM (12 months ago)

Author:

Bruno Cornec

Message:

Rewrite find_dvd_device

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-devices-EXT.h (modified) (1 diff)
• common/libmondo-devices.c (modified) (4 diffs)
• common/libmondo-stream.c (modified) (3 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-devices-EXT.h

@@ -10 +10 @@
                                     char *mountpoint);
 extern int find_cdrom_device(char *output, bool try_to_mount);
-extern int find_dvd_device(char *output);
+extern char *find_dvd_device(void);
 extern long get_phys_size_of_drive(char *drive);
 extern bool is_this_a_valid_disk_format(char *format);

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

@@ -22 +22 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
-#include "libmondo-newt-specific-EXT.h"
+#include "newt-specific-EXT.h"
 
 #ifdef __FreeBSD__
@@ -867 +867 @@
  * and return it's device file to the caller that needs to free it
  */
-char *find_dvd_device()
-{
-    char *tmp = NULL;
+char *find_dvd_device(void)
+{
+    char *dev = NULL;
     char *tmp1 = NULL;
-    int retval = 0, devno = -1;
+    char *command = NULL;
+
+    log_to_screen("I am looking for your optical burner. Please wait.");
 
     if (bkpinfo->media_device != NULL) {
@@ -879 +881 @@
 
     mr_asprintf(tmp1, "cdrecord -inq 2> /dev/null | grep -E '^Detected '  | cut -d':' -f2");
-    tmp = call_program_and_get_last_line_of_output(tmp1);
+    dev = call_program_and_get_last_line_of_output(tmp1);
     mr_free(tmp1);
-    log_msg(5, "find_dvd_device found device '%s'", tmp);
-
-    if (tmp != NULL) {
-        log_msg(2, "I think DVD is at %s", bkpinfo->media_device);
+
+    if ((dev != NULL) && does_file_exist(dev)) {
+        log_msg(2, "find_dvd_device found %s automatically", dev);
     } else {
-        log_msg(2, "I cannot find DVD");
-    }
-    bkpinfo->media_device = tmp;
-    return(bkpinfo->media_device);
+        mr_free(dev);
+        tmp1 = find_home_of_exe("lsscsi");
+        if (tmp1 != NULL) {
+            mr_asprintf(command, "%s | grep ' cd' | awk '{print $NF}' | head -1", tmp1);
+            dev = call_program_and_get_last_line_of_output(command);
+            mr_free(command);
+        }
+        mr_free(tmp1);
+
+        if ((dev == NULL) || !does_file_exist(dev)) {
+            /* trying something else then */
+            mr_asprintf(dev, "%s", VANILLA_SCSI_CDROM);
+            if (!does_file_exist(dev)) {
+                mr_asprintf(dev, "%s", ALT_CDROM);
+                if (!does_file_exist(dev)) {
+                    log_it("Unable to find a tape device on this system");
+                }
+            }
+        }
+        if (dev != NULL) {
+            log_it("find_dvd_device found %s manually", dev);
+        }
+    } 
+
+    if ((dev != NULL) && does_file_exist(dev)) {
+        log_it("find_dvd_device returns %s", dev);
+    } else {
+        mr_free(dev);
+        log_it("find_dvd_device found no optical burner on your system returning NULL");
+    }
+    return(dev);
 }
 
@@ -2246 +2274 @@
             mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
-                find_dvd_device(bkpinfo->media_device);
+                bkpinfo->media_device = find_dvd_device();
+                if (bkpinfo->media_device == NULL) {
+                    log_msg(1, "No backup device found for your DVD");
+                }
                 strcpy(tmp1, "1");
                 mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB

branches/3.3/mondo/src/common/libmondo-stream.c

@@ -310 +310 @@
     log_to_screen("I am looking for your tape streamer. Please wait.");
 
+    if (bkpinfo->media_device != NULL) {
+        log_msg(3, "Been there, done that. Returning %s", bkpinfo->media_device);
+        return (bkpinfo->media_device);
+    }
+
     tmp = find_home_of_exe("lsscsi");
     if (tmp != NULL) {
@@ -318 +323 @@
     mr_free(tmp);
 
-    if (dev != NULL) && does_file_exist(dev) {
+    if ((dev != NULL) && does_file_exist(dev)) {
         if (mt_says_tape_exists(dev)) {
             log_it("find_tape_device found %s automatically", dev);
@@ -334 +339 @@
             }
         }
-        log_it("find_tape_device found %s manually", dev);
-    }
-
-    if (dev != NULL) {
+        if (dev != NULL) {
+            log_it("find_tape_device found %s manually", dev);
+        }
+    }
+
+    if ((dev != NULL) && does_file_exist(dev)) {
         log_it("find_tape_device returns %s", dev);
     } else {
+        mr_free(dev);
         log_it("find_tape_device found no tape on your system returning NULL");
     }

branches/3.3/mondo/src/include/my-stuff.h

@@ -315 +315 @@
 #define CP_BIN      "gcp"
 #else
-#define VANILLA_SCSI_CDROM  "/dev/scd0"
+#define VANILLA_SCSI_CDROM  "/dev/sr0"
+#define ALT_CDROM   "/dev/scd0"
 #define VANILLA_SCSI_TAPE   "/dev/st0"
 #define VANILLA_USB_DEVICE  "/dev/hda"

branches/3.3/mondo/src/mondoarchive/mondoarchive.c

@@ -300 +300 @@
         g_loglevel = 10;
         setup_newt_stuff();
-        malloc_string(tmp);
-        if (find_dvd_device(tmp)) {
+        if (tmp = find_dvd_device()) {
             printf("Failed to find DVD drive\n");
         } else {