Changeset 3874 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 7, 2024, 7:23:09 PM (4 months ago)

Author:

Bruno Cornec

Message:

remove differentiated support for cdrw

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (8 diffs)

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

@@ -55 +55 @@
 extern char *call_program_and_get_last_line_of_output(const char *);
 
-static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
+static char g_cd_drive_is_here[MAX_STR_LEN / 4] = "";
 static char g_cdrom_drive_is_here[MAX_STR_LEN / 4] = "";
 static char g_dvd_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -105 +105 @@
         if (strlen(g_dvd_drive_is_here) > 0) {
             inject_device(g_dvd_drive_is_here);
-        }
-        if (strlen(g_cdrw_drive_is_here) > 0) {
-            inject_device(g_cdrw_drive_is_here);
         }
     }
@@ -188 +185 @@
     case cdr:
         strcpy(output, "cdr");
-        break;
-    case cdrw:
-        strcpy(output, "cdrw");
         break;
     case cdstream:
@@ -501 +495 @@
     }
     return (res);
-}
-
-
-
-
-
-
-/**
- * Locate a CD-R/W writer's SCSI node.
- * @param cdrw_device SCSI node will be placed here.
- * @return 0 for success, nonzero for failure.
- */
-int find_cdrw_device(char *cdrw_device)
-{
-    /*@ buffers ************************ */
-    char *tmp = NULL;
-    char *cdr_exe = NULL;
-    char *command = NULL;
-
-    if (g_cdrw_drive_is_here[0]) {
-        strcpy(cdrw_device, g_cdrw_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", cdrw_device);
-        return (0);
-    }
-    if (g_backup_media_type == dvd) {
-        log_msg(1, "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
-        return (1);
-    }
-    run_program_and_log_output("insmod ide-scsi", -1);
-    if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
-        if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
-            cdr_exe = find_home_of_exe("dvdrecord");
-        }
-    }
-    if (cdr_exe != NULL) {
-        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-    }
-    if ((tmp == NULL) || (strlen(tmp) < 2)) {
-        mr_free(tmp);
-        mr_free(cdr_exe);
-        return (1);
-    } else {
-        strcpy(cdrw_device, tmp);
-        log_it("Found CDRW device - %s", cdrw_device);
-        strcpy(g_cdrw_drive_is_here, cdrw_device);
-        mr_free(tmp);
-        mr_free(cdr_exe);
-        return (0);
-    }
 }
 
@@ -786 +729 @@
                                         (found_it =
                                          set_dev_to_this_if_rx_OK(output,
-                                                                  g_cdrw_drive_is_here)))
+                                                                  g_cd_drive_is_here)))
                                     {
                                         retval = 1;
@@ -837 +780 @@
     }
 
-    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cd_drive_is_here);
 
     log_msg(1, "command=%s", command);
@@ -2249 +2192 @@
     switch (bkpinfo->backup_media_type) {
     case cdr:
-    case cdrw:
     case dvd:
     case usb:
@@ -2338 +2280 @@
             log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
         } else {
-            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
+            if ((find_cdrom_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
                 mr_free(bkpinfo->media_device);
             }