From 49fccf2a2402912a5511483b7002d728c07a29a1 Mon Sep 17 00:00:00 2001
From: "Justin T. Gibbs" <gibbs@FreeBSD.org>
Date: Tue, 15 Sep 1998 10:25:50 +0000
Subject: [PATCH] Add support for dealing with ENOSPC as the error code
 returned by a tape device hitting EOM on a write.

---
 sbin/dump/dumprmt.c | 19 ++++++++-----------
 sbin/dump/tape.c    | 14 +++++++++-----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index f27d2143c0ab..caf6736fba0d 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: dumprmt.c,v 1.11 1998/06/15 06:58:09 charnier Exp $";
+	"$Id: dumprmt.c,v 1.12 1998/07/14 09:19:46 jkoshy Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -250,19 +250,16 @@ rmtread(buf, count)
 {
 	char line[30];
 	int n, i, cc;
-	extern errno;
 
 	(void)snprintf(line, sizeof (line), "R%d\n", count);
 	n = rmtcall("read", line);
-	if (n < 0) {
-		errno = n;
-		return (-1);
-	}
+	if (n < 0)
+		/* rmtcall() properly sets errno for us on errors. */
+		return (n);
 	for (i = 0; i < n; i += cc) {
 		cc = read(rmtape, buf+i, n - i);
-		if (cc <= 0) {
+		if (cc <= 0)
 			rmtconnaborted();
-		}
 	}
 	return (n);
 }
@@ -360,15 +357,15 @@ rmtreply(cmd)
 {
 	register char *cp;
 	char code[30], emsg[BUFSIZ];
+	extern int errno;
 
 	rmtgets(code, sizeof (code));
 	if (*code == 'E' || *code == 'F') {
 		rmtgets(emsg, sizeof (emsg));
 		msg("%s: %s", cmd, emsg);
-		if (*code == 'F') {
+		errno = atoi(code + 1);
+		if (*code == 'F')
 			rmtstate = TS_CLOSED;
-			return (-1);
-		}
 		return (-1);
 	}
 	if (*code != 'A') {
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 1fda0069bdbe..e7b66c75867a 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: tape.c,v 1.9 1998/06/15 06:58:11 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -822,13 +822,17 @@ doslave(cmd, slave_number)
 		     slave_number, size, writesize);
 #endif
 
+		/*
+		 * Handle ENOSPC as an EOT condition.
+		 */
+		if (wrote < 0 && errno == ENOSPC) {
+			wrote = 0;
+			eot_count++;
+		}
+
 		if (eot_count > 0)
 			size = 0;
 
-		/*
-		 * fixme: Pyramids running OSx return ENOSPC
-		 * at EOT on 1/2 inch drives.
-		 */
 		if (wrote < 0) {
 			(void) kill(master, SIGUSR1);
 			for (;;)