Use tapeio library instead of direct device access.

Author: larsbrinkhoff

Makefile

@@ -34,13 +34,14 @@ MODE=4755
 BINDIR=/usr/bin
 MANSEC=1
 MANDIR=/usr/share/man/man$(MANSEC)
-DISTFILES=README vmsbackup.1 Makefile vmsbackup.c match.c NEWS  build.com dclmain.c getoptmain.c vmsbackup.cld vmsbackup.h  sysdep.h
+DISTFILES=README vmsbackup.1 Makefile vmsbackup.c match.c NEWS  build.com dclmain.c getoptmain.c vmsbackup.cld vmsbackup.h  sysdep.h tapeio.c
 
-vmsbackup: vmsbackup.o match.o getoptmain.o hexdump.o
+vmsbackup: vmsbackup.o match.o getoptmain.o hexdump.o tapeio.o
 
 vmsbackup.o : vmsbackup.c
 match.o : match.c
 getoptmain.o : getoptmain.c
+tapeio.o : tapeio.c
 
 install:
 	install -m $(MODE) -o $(OWNER) -s vmsbackup $(BINDIR)

vmsbackup.c

@@ -72,6 +72,7 @@ int mkdir (char *path, int mode);
 #include "vmsbackup.h"
 #include "match.h"
 #include "sysdep.h"
+#include "tapeio.h"
 
 #ifdef DEBUG
 static void debug_dump(const unsigned char* buffer, int dsize, int dtype);
@@ -182,7 +183,7 @@ unsigned long nblocks;
 FILE	*lf;
 #endif
 
-int	fd;		/* tape file descriptor */
+tape_handle_t fd;		/* tape file descriptor */
 
 /* Command line stuff.  */
 
@@ -1105,7 +1106,7 @@ int rdhead(void)
 	char name[80];
 	nfound = 1;
 	/* read the tape label - 4 records of 80 bytes */
-	while ((i = read(fd, label, LABEL_SIZE)) != 0) {
+	while ((i = getrec(fd, label, LABEL_SIZE)) != 0) {
 		if (i != LABEL_SIZE) {
 			fprintf(stderr, "Snark: bad label record\n");
 			exit(1);
@@ -1144,7 +1145,7 @@ void rdtail(void)
 	int i;
 	char name[80];
 	/* read the tape label - 4 records of 80 bytes */
-	while ((i = read(fd, label, LABEL_SIZE)) != 0) {
+	while ((i = getrec(fd, label, LABEL_SIZE)) != 0) {
 		if (i != LABEL_SIZE) {
 			fprintf(stderr, "Snark: bad label record\n");
 			exit(1);
@@ -1182,28 +1183,14 @@ void vmsbackup(void)
 #endif
 
 	/* open the tape file */
-	fd = open(tapefile, O_RDONLY);
-	if (fd < 0) {
+	fd = opentape(tapefile, 0, 0);
+	if (fd == NULL) {
 		perror(tapefile);
 		exit(1);
 	}
+	ondisk = 0;
 
-#if HAVE_MT_IOCTLS
-	/* rewind the tape */
-	op.mt_op = MTREW;
-	op.mt_count = 1;
-	i = ioctl(fd, MTIOCTOP, &op);
-	if (i < 0) {
-		if (errno == EINVAL || errno == ENOTTY) {
-			ondisk = 1;
-		} else {
-			perror(tapefile);
-			exit(1);
-		}
-	}
-#else
-	ondisk = 1;
-#endif
+	posnbot(fd);
 
 	if (ondisk) {
 		/* process_block wants this to match the size which
@@ -1236,21 +1223,11 @@ void vmsbackup(void)
 				fprintf(stderr, "-s not supported for disk savesets\n");
 				exit(1);
 			}
-#if HAVE_MT_IOCTLS
-			op.mt_op = MTFSF;
-			op.mt_count = 1;
-			i = ioctl(fd, MTIOCTOP, &op);
-			if (i < 0) {
-				perror(tapefile);
-				exit(1);
-			}
-#else
-			abort ();
-#endif
+			skipfile(fd, 1);
 			i = 0;
 		}
 		else
-			i = read(fd, block, blocksize);
+		  i = getrec(fd, block, blocksize);
 		if(i == 0) {
 			if (ondisk) {
 				/* No need to support multiple save sets.  */
@@ -1287,7 +1264,7 @@ void vmsbackup(void)
 	}
 
 	/* close the tape */
-	close(fd);
+	closetape(fd);
 
 #ifdef	NEWD
 	/* close debug file */