From: David Levine <levinedl@acm.org>
Date: Tue, 30 Oct 2018 01:54:08 +0000 (-0400)
Subject: Revert "scan(1) now checks for full output device [Bug #50925]."
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/48f6dc0005a0e12ef19c7b61d851d56289aa805b

Revert "scan(1) now checks for full output device [Bug #50925]."

This reverts commit f54674f1b5d07148d9655fc3b337ad5f725272a7.
---

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 4623da54..138a909b 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -19,4 +19,3 @@ DEPRECATED FEATURES
 BUG FIXES
 ---------
 
-- scan(1) now checks for full output device [Bug #50925].
\ No newline at end of file
diff --git a/test/scan/test-scan b/test/scan/test-scan
index 510ad36a..00e383cb 100755
--- a/test/scan/test-scan
+++ b/test/scan/test-scan
@@ -39,15 +39,6 @@ run_prog scan +inbox -width 80 >"$actual" || exit 1
 check "$expected" "$actual"
 
 
-# check full output device, if one exists
-if test -c /dev/full; then
-  start_test 'full output device'
-  printf 'scan: failed to fflush stdout: No space left on device\n' >"$expected"
-  scan last >/dev/full 2>"$actual"  &&  false
-  check "$expected" "$actual"
-fi
-
-
 # check highlighting
 start_test 'highlighting'
 cat >"$expected" <<EOF
diff --git a/uip/scan.c b/uip/scan.c
index c85a9efd..b999378b 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -299,9 +299,8 @@ main (int argc, char **argv)
 	    scan_finished ();
 	    hdrflag = false;
 	    fclose (in);
-	    if (ontty  &&  fflush (stdout) == EOF) {
-		adios("stdout", "failed to fflush");
-	    }
+	    if (ontty)
+		fflush (stdout);
 	}
     }
     charstring_free (scanl);
diff --git a/uip/scansbr.c b/uip/scansbr.c
index 2d281c2b..38b2ca41 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -340,14 +340,8 @@ finished:
     if (bodycomp)
 	bodycomp->c_text = saved_c_text;
 
-    if (noisy) {
-	if (fputs (charstring_buffer (*scanl), stdout) == EOF) {
-	    adios("stdout", "failed to fputs");
-	}
-	if (fflush (stdout)) {
-	    adios("stdout", "failed to fflush");
-	}
-    }
+    if (noisy)
+	fputs (charstring_buffer (*scanl), stdout);
 
     cptr = fmt_findcomp ("encrypted");
     encrypted = cptr && cptr->c_text;