Changeset 3870 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Rewrite find_tape_device ans start for other find_*dev functions

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-archive.c (modified) (9 diffs)
• libmondo-cli.c (modified) (9 diffs)
• libmondo-devices.c (modified) (11 diffs)
• libmondo-stream-EXT.h (modified) (1 diff)
• libmondo-stream.c (modified) (2 diffs)

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

@@ -27 +27 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-verify-EXT.h"
-#include "lib-common-externs.h"
+
 #include <sys/sem.h>
 #include <sys/types.h>
@@ -2527 +2527 @@
     char *mds = NULL;
 
-    malloc_string(cdrom_dev);
     malloc_string(cdrw_dev);
 
@@ -2542 +2541 @@
   gotos_make_me_puke:
     ok_go_ahead_burn_it = TRUE;
-    if (!find_cdrom_device(cdrom_dev, FALSE)) {
+    mr_free(cdrom_dev);
+    if ((cdrom_dev = find_cdrom_device()) != NULL) {
         /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
         log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
@@ -2632 +2632 @@
     mr_free(mds);
 
-    paranoid_free(cdrom_dev);
+    mr_free(cdrom_dev);
     paranoid_free(cdrw_dev);
     mr_free(mtpt);
@@ -3044 +3044 @@
     int res = 0;
 
-    malloc_string(tmp);
-
     assert(bkpinfo != NULL);
     orig_vfy_flag_val = bkpinfo->verify_data;
@@ -3105 +3103 @@
             && (bkpinfo->backup_media_type == cdr
                 || bkpinfo->backup_media_type == cdrw)) {
-            if (find_cdrom_device(tmp, FALSE))  // make sure find_cdrom_device() finds, records CD-R's loc
-            {
+            if ((tmp = find_cdrom_device()) == NULL) {  // make sure find_cdrom_device() finds, records CD-R's loc
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
                 // if it can't be found then force pausing
@@ -3113 +3110 @@
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
             }
+            mr_free(tmp);
         }
         if (bkpinfo->verify_data && !res) {
@@ -3167 +3165 @@
 
     bkpinfo->verify_data = orig_vfy_flag_val;
-    paranoid_free(tmp);
     return (0);
 }
@@ -3217 +3214 @@
         g_current_media_number = cdno;
         if (bkpinfo->backup_media_type != iso) {
-            find_cdrom_device(bkpinfo->media_device, FALSE);    // replace 0,0,0 with /dev/cdrom
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = find_cdrom_device();    // replace 0,0,0 with /dev/cdrom
         }
         if (chdir("/")) {

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);
-        }
     }
 

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

@@ -15 +15 @@
 #include "mr_str.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
+
 #include "libmondo-files-EXT.h"
 #include "libmondo-string-EXT.h"
@@ -22 +22 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
+#include "libmondo-newt-specific-EXT.h"
 
 #ifdef __FreeBSD__
@@ -52 +53 @@
 extern void setup_tmpdir(char *path);
 extern void setup_scratchdir(char *path);
-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 *);
 
@@ -467 +467 @@
     /*@ int's  ****************************************************** */
     int res;
-    char *dev = NULL;
 
     /*@ end vars **************************************************** */
 
-    malloc_string(dev);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
     if (g_backup_media_type == dvd) {
-        strcpy(dev, g_dvd_drive_is_here);
-        if (!dev[0]) {
-            find_dvd_device(dev);
+        if (bkpinfo->media_device == NULL) {
+            bkpinfo->media_device = find_dvd_device();
         }
     } else {
-        strcpy(dev, g_cdrom_drive_is_here);
-        if (!dev[0]) {
-            find_cdrom_device(dev, FALSE);
+        if (bkpinfo->media_device == NULL) {
+            bkpinfo->media_device = find_cdrom_device();
         }
     }
@@ -491 +487 @@
     }
 
-    if (!dev[0] || (res = mount_CDROM_here(dev, mountpoint))) {
-        if (!popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", dev,(MAX_STR_LEN / 4)-1)) {
+    if ((bkpinfo->media_device == NULL) || (res = mount_CDROM_here(bkpinfo->media_device, mountpoint))) {
+        mr_free(bkpinfo->media_device);
+        if ((bkpinfo->media_device = mr_popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", "/dev/cdrom")) == NULL) {
             res = 1;
         } else {
-            res = mount_CDROM_here(dev, mountpoint);
+            res = mount_CDROM_here(bkpinfo->media_device, mountpoint);
         }
     }
@@ -501 +498 @@
         log_msg(1, "mount failed");
     } else {
-        log_msg(1, "mount succeeded with %s", dev);
-    }
-    paranoid_free(dev);
+        log_msg(1, "mount succeeded with %s", bkpinfo->media_device);
+    }
     return (res);
 }
@@ -867 +863 @@
 }
 
-
-int find_dvd_device(char *output)
+/* 
+ * This function tries to find an optical media device
+ * and return it's device file to the caller that needs to free it
+ */
+char *find_dvd_device()
 {
     char *tmp = NULL;
@@ -874 +873 @@
     int retval = 0, devno = -1;
 
-    if (g_dvd_drive_is_here[0]) {
-        strcpy(output, g_dvd_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", output);
-        return (0);
-    }
-
-    mr_asprintf(tmp1, "cdrecord -inq dev=%s 2> /dev/null | grep -E 'Device seems to be'  | cut -d':' -f2", output);
+    if (bkpinfo->media_device != NULL) {
+        log_msg(3, "Been there, done that. Returning %s", bkpinfo->media_device);
+        return (bkpinfo->media_device);
+    }
+
+    mr_asprintf(tmp1, "cdrecord -inq 2> /dev/null | grep -E '^Detected '  | cut -d':' -f2");
     tmp = call_program_and_get_last_line_of_output(tmp1);
     mr_free(tmp1);
-    log_msg(5, "cdrecord tmp = '%s'", tmp);
-    mr_free(tmp);
+    log_msg(5, "find_dvd_device found device '%s'", tmp);
 
     if (tmp != NULL) {
-        strcpy(g_dvd_drive_is_here, output);
-        log_msg(2, "I think DVD is at %s", output);
+        log_msg(2, "I think DVD is at %s", bkpinfo->media_device);
     } else {
         log_msg(2, "I cannot find DVD");
-        retval = 1;
-    }
-    return(retval);
+    }
+    bkpinfo->media_device = tmp;
+    return(bkpinfo->media_device);
 }
 
@@ -2358 +2354 @@
     case tape:
 
-        if ((!bkpinfo->restore_mode) && (find_tape_device(bkpinfo->media_device))) {
-            log_msg(3, "Ok, using vanilla scsi tape.");
-            mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);
-            if ((fin = fopen(bkpinfo->media_device, "r"))) {
-                paranoid_fclose(fin);
-            } else {
-                mr_asprintf(bkpinfo->media_device, "%s", "/dev/osst0");
-            }
-        }
+        bkpinfo->media_device = find_tape_device();
         if (bkpinfo->media_device != NULL) {
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
@@ -2384 +2372 @@
         }
         if (bkpinfo->media_device == NULL) {
-            tmp2 = mr_popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device);
+            tmp2 = mr_popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", "");
             if (tmp2 == NULL) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
             } else {
-                mr_free(bkpinfo->media_device);
                 bkpinfo->media_device = tmp2;
             }
@@ -2421 +2408 @@
         log_msg(4, "media_size = %ld", bkpinfo->media_size);
 
-        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 ?");
         if (bkpinfo->use_obdr) {
             log_msg(4, "obdr mode = TRUE");

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

@@ -5 +5 @@
 extern int closein_tape();
 extern int closeout_tape();
-extern int find_tape_device(char *dev);
+extern char *find_tape_device(void);
 extern void insist_on_this_tape_number(int tapeno);
 extern void log_tape_pos(void);

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

@@ -16 +16 @@
 #include "mr_file.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
+
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -299 +299 @@
 
 /**
- * Determine the name and size of the tape device. Tries the SCSI tape for
- * this platform, then the IDE tape, then "/dev/st0", then "/dev/osst0".
- * @param dev Where to put the found tape device. Allocated dynamically by caller or reallocated here
- * @param siz Where to put the tape size (a string like "4GB")
- * @return 0 if success, nonzero if failure (in which @p dev and @p siz are undefined).
- */
-int find_tape_device(char *dev) {
+ * Determine the name of the tape device. Tries the SCSI tape for
+ * this platform, then "/dev/st0", then "/dev/ht0" and "/dev/osst0".
+ * @return the value of the tape device or NULL if not found. Allocated dynamically must be freed by caller.
+ */
+char *find_tape_device(void) {
     char *tmp = NULL;
+    char *dev = NULL;
     char *command = NULL;
-    char *cdr_exe = NULL;
-    int res;
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    mr_free(dev);
-    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");
-        }
-    }
-    mr_asprintf(command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l", cdr_exe);
-    tmp = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-
-    if (atoi(tmp) != 1) {
-        log_it("Either too few or too many tape streamers for me to detect...");
+
+    tmp = find_home_of_exe("lsscsi");
+    if (tmp != NULL) {
+        mr_asprintf(command, "%s | grep ' tape' | awk '{print $NF}' | head -1", tmp);
+        dev = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+    }
+    mr_free(tmp);
+
+    if (dev != NULL) && does_file_exist(dev) {
+        if (mt_says_tape_exists(dev)) {
+            log_it("find_tape_device found %s automatically", dev);
+        }
+    } else {
+        /* trying something else then */
         mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
-        mr_free(tmp);
-        mr_free(cdr_exe);
-        return 1;
-    }
-    mr_free(tmp);
-
-    mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1", cdr_exe);
-    tmp = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-
-    if (strlen(tmp) < 2) {
-        log_it("Could not find tape device");
-        mr_free(cdr_exe);
-        mr_free(tmp);
-        return 1;
-    }
-    mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1", cdr_exe);
-    mr_free(cdr_exe);
-
-    tmp = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-
-    mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
-    dev[strlen(dev) - 1] = '\0';
-    mr_strcat(dev, tmp);            // e.g. '/dev/st0' becomes '/dev/stN'
-    mr_free(tmp);
-
-    res = 0;
-    if (!mt_says_tape_exists(dev)) {
-        mr_asprintf(dev, "%s", ALT_TAPE);
         if (!mt_says_tape_exists(dev)) {
-            log_it("Cannot openin %s", dev);
-            mr_asprintf(dev, "%s", "/dev/st0");
+            mr_asprintf(dev, "%s", ALT_TAPE);
             if (!mt_says_tape_exists(dev)) {
-                log_it("Cannot openin %s", dev);
                 mr_asprintf(dev, "%s", "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
-                    res++;
-                } else {
-                    res = 0;
+                    log_it("Unable to find a tape device on this system");
                 }
             }
         }
-    }
-
-    if (dev) {
-        log_it("At this point, dev = %s and res = %d", dev, res);
-    } else {
-        log_it("At this point, dev is NULL and res = %d", res);
-    }
-
-    if (mt_says_tape_exists(dev)) {
-        res = 0;
-    } else {
-        log_it("Turning %s", dev);
-        mr_free(tmp);
-        mr_asprintf(tmp, "%s", (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
-        mr_asprintf(dev, "/dev/os%s", tmp);
-        log_it("...into %s", dev);
-        if (mt_says_tape_exists(dev)) {
-            res = 0;
-        } else {
-            res++;
-        }
-    }
-    log_it("res=%d; dev=%s", res, dev);
-    return (res);
+        log_it("find_tape_device found %s manually", dev);
+    }
+
+    if (dev != NULL) {
+        log_it("find_tape_device returns %s", dev);
+    } else {
+        log_it("find_tape_device found no tape on your system returning NULL");
+    }
+    return (dev);
 }