Changeset 3853 in MondoRescue for branches/3.3

Timestamp:

Mar 6, 2024, 3:41:10 AM (4 months ago)

Author:

Bruno Cornec

Message:

Fix find_dvd_device by removing useless second param and using wodim -inq

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-cli.c (modified) (2 diffs)
• common/libmondo-devices-EXT.h (modified) (1 diff)
• common/libmondo-devices.c (modified) (6 diffs)
• common/libmondo-devices.h (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (1 diff)

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

@@ -45 +45 @@
 extern pid_t g_main_pid;
 extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
-extern char *mr_popup_and_get_string(char *, char *, char *);
+extern char *mr_popup_and_get_string(const char *, const char *, const char *);
 extern char *call_program_and_get_last_line_of_output(const char *);
 
@@ -354 +354 @@
         }
         if (!flag_set['d']) {
-            if (!find_dvd_device(flag_val['d'], FALSE)) {
+            if (!find_dvd_device(flag_val['d'])) {
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);

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, bool try_to_mount);
+extern int find_dvd_device(char *output);
 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

@@ -53 +53 @@
 extern void setup_tmpdir(char *path);
 extern void setup_scratchdir(char *path);
-extern char *mr_popup_and_get_string(char *title, char *b, char *input);
+extern char *mr_popup_and_get_string(const char *title, const char *b, const char *input);
 extern char *call_program_and_get_last_line_of_output(const char *);
 
@@ -479 +479 @@
         strcpy(dev, g_dvd_drive_is_here);
         if (!dev[0]) {
-            find_dvd_device(dev, FALSE);
+            find_dvd_device(dev);
         }
     } else {
         strcpy(dev, g_cdrom_drive_is_here);
         if (!dev[0]) {
-            find_cdrom_device(dev, FALSE);
+            find_cdrom_device(dev);
         }
     }
@@ -870 +870 @@
 
 
-int find_dvd_device(char *output, bool try_to_mount)
+int find_dvd_device(char *output)
 {
     char *tmp = NULL;
+    char *tmp1 = NULL;
     int retval = 0, devno = -1;
 
@@ -881 +882 @@
     }
 
-    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1");
-    log_msg(5, "tmp = '%s'", tmp);
-    if (!tmp[0]) {
-        mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1");
-    }
-    if (tmp[0]) {
-        devno = atoi(tmp) - 1;
-    }
+    mr_asprintf(tmp1, "cdrecord -inq dev=%s 2> /dev/null | grep -E 'Device seems to be'  | cut -d':' -f2", output);
+    tmp = call_program_and_get_last_line_of_output(tmp1);
+    mr_free(tmp1);
+    log_msg(5, "cdrecord tmp = '%s'", tmp);
     mr_free(tmp);
 
-    if (devno >= 0) {
-        retval = 0;
-        sprintf(output, "/dev/scd%d", devno);
+    if (tmp != NULL) {
         strcpy(g_dvd_drive_is_here, output);
         log_msg(2, "I think DVD is at %s", output);
@@ -901 +895 @@
         retval = 1;
     }
-
-    return (retval);
+    return(retval);
 }
 
@@ -2259 +2252 @@
             mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
-                find_dvd_device(bkpinfo->media_device, FALSE);
+                find_dvd_device(bkpinfo->media_device);
                 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-devices.h

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

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

@@ -301 +301 @@
         setup_newt_stuff();
         malloc_string(tmp);
-        if (find_dvd_device(tmp, atoi(argv[2]))) {
+        if (find_dvd_device(tmp)) {
             printf("Failed to find DVD drive\n");
         } else {