Imported Upstream version 2.5.1p3

[debian/amanda] / server-src / taperscan.c

diff --git a/server-src/taperscan.c b/server-src/taperscan.c
index b39302cad5119fdbb23f004bfc8fc0f9c3d21e00..d4a0faa66e1fa5fa80f9f56783565011143a7e71 100644 (file)
--- a/server-src/taperscan.c
+++ b/server-src/taperscan.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * $Id: taperscan.c,v 1.17 2006/07/12 12:28:19 martinea Exp $
+ * $Id: taperscan.c,v 1.17.2.1 2006/10/03 11:35:52 martinea Exp $
  *
  * This contains the implementation of the taper-scan algorithm, as it is
  * used by taper, amcheck, and amtape. See the header file taperscan.h for
@@ -314,10 +314,16 @@ int taper_scan(char* wantlabel,
     }
     else {
        *tapedev = stralloc(getconf_str(CNF_TAPEDEV));
-       result =  scan_read_label(*tapedev, wantlabel,
-                                 gotlabel, timestamp, &error_message);
-       taperscan_output_callback(data, error_message);
-       amfree(error_message);
+       if (*tapedev == NULL) {
+           result = -1;
+           taperscan_output_callback(data, "No tapedev spefified");
+       } else {
+           *tapedev = stralloc(*tapedev);
+           result =  scan_read_label(*tapedev, wantlabel,
+                                     gotlabel, timestamp, &error_message);
+           taperscan_output_callback(data, error_message);
+           amfree(error_message);
+       }
     }
 
     return result;