Changeset 3870 in MondoRescue for branches/3.3/mondo/src/common/libmondo-cli.c

Timestamp:

Mar 7, 2024, 6:05:50 PM (2 months ago)

Author:

Bruno Cornec

Message:

Rewrite find_tape_device ans start for other find_*dev functions

File:

• branches/3.3/mondo/src/common/libmondo-cli.c (modified) (9 diffs)

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

@@ -16 +16 @@
 #include "mondostructures.h"
 #include "libmondo-cli-EXT.h"
+#include "libmondo-newt-specific-EXT.h"
 #include "libmondo.h"
 
@@ -45 +46 @@
 extern pid_t g_main_pid;
 extern char *resolve_softlinks_to_get_to_actual_device_file(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 *);
 
@@ -294 +294 @@
 
     if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
-        if (!flag_set['r'] && g_kernel_version <= 2.5 && strstr(flag_val['d'], "/dev/")) {
-            fatal_error("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
-        }
-        if (flag_set['r'] && g_kernel_version <= 2.5 && !strstr(flag_val['d'], "/dev/")) {
-            fatal_error("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
-        }
-        if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
-            log_to_screen("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
-        }
-
         if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
             fatal_error("Please install dvdrecord/cdrecord and try again.");
@@ -336 +326 @@
     if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
-        if (find_tape_device(flag_val['d'])) {
-            fatal_error("Tape device not specified. I couldn't find it either.");
+        if ((bkpinfo->media_device = find_tape_device()) == NULL) {
+            fatal_error("Tape device not specified and I couldn't find it either. Please use option -d");
         }
         flag_set['d'] = TRUE;
-        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
+        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", bkpinfo->media_device);
     }
 
@@ -359 +349 @@
         }
         if (!flag_set['d']) {
-            if (!find_dvd_device(flag_val['d'])) {
+            if ((bkpinfo->media_device = find_dvd_device()) != NULL) {
                 flag_set['d'] = TRUE;
-                log_to_screen("I guess DVD drive is at %s", flag_val['d']);
-            }
-        }
-        if (strchr(flag_val['d'], ',')) {
+                log_to_screen("I guess DVD drive is at %s", bkpinfo->media_device);
+            }
+        }
+        if (strchr(bkpinfo->media_device, ',')) {
             fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
@@ -686 +676 @@
     if (flag_set['d']) {        /* backup directory (if ISO/NETFS) */
         if (flag_set['i']) {
+            // what is flag_val['d'] is NULL/undefined
             mr_asprintf(bkpinfo->isodir, "%s", flag_val['d']);
             mr_asprintf(tmp1, "ls -l %s", bkpinfo->isodir);
@@ -695 +686 @@
         } else if (flag_set['n']) {
             mr_free(bkpinfo->netfs_remote_dir);
+            // what is flag_val['d'] is NULL/undefined
             mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-            mr_asprintf(bkpinfo->media_device, "%s", flag_val['d']);
+            /* bkpinfo-> media_device already setup upper */
         }
     }
@@ -720 +712 @@
 
     if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
-        if (g_kernel_version >= 2.6) {
             tmp1 = mr_popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
             if (tmp1 == NULL) {
@@ -729 +720 @@
                 bkpinfo->media_device = tmp1;
             }
-        } else if (find_cdrw_device(bkpinfo->media_device)) {
-            retval++;
-            log_to_screen("Tried and failed to find CD-R[W] drive automatically.\n");
         } else {
-            flag_set['d'] = TRUE;
-            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
-        }
     }