Changeset 1569 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

Jul 26, 2007, 1:18:38 AM (17 years ago)

Author:

Bruno Cornec

Message:

Improvements on tape handling (based on patches from Michel Loiseleur <mloiseleur_at_linagora.com>)

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (4 diffs)

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

@@ -274 +274 @@
     int res;
 
+    strcpy(dev, VANILLA_SCSI_TAPE);
     log_to_screen("I am looking for your tape streamer. Please wait.");
+    log_it("I am looking for your tape streamer. Please wait.");
+    log_it("Taking %s as default",VANILLA_SCSI_TAPE);
     dev[0] = siz[0] = '\0';
     if (find_home_of_exe("cdrecord")) {
@@ -286 +289 @@
     mr_free(command);
     if (atoi(tmp) != 1) {
-        log_it
-            ("Either too few or too many tape streamers for me to detect...");
+        log_it("Either too few or too many tape streamers for me to detect...");
+        log_it("Taking %s",VANILLA_SCSI_TAPE);
         strcpy(dev, VANILLA_SCSI_TAPE);
         return 1;
@@ -297 +300 @@
     mr_free(command);
     if (strlen(tmp) < 2) {
-        log_it("Could not find tape device");
+        log_it("Could not check tape device with %s",cdr_exe);
         return 1;
     }
@@ -314 +317 @@
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
-            strcpy(dev, "/dev/st0");
+            strcpy(dev, "/dev/osst0");
             if (!mt_says_tape_exists(dev)) {
-                log_it("Cannot openin %s", dev);
-                strcpy(dev, "/dev/osst0");
-                if (!mt_says_tape_exists(dev)) {
-                    res++;
-                } else {
-                    res = 0;
-                }
+                res++;
+            } else {
+                res = 0;
             }
         }