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 4623da5..138a909 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -19,4 +19,3 @@ DEPRECATED FEATURES
 BUG FIXES
 ---------
 
 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 510ad36..00e383c 100755 (executable)
--- 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 "$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
 # check highlighting
 start_test 'highlighting'
 cat >"$expected" <<EOF

diff --git a/uip/scan.c b/uip/scan.c
index c85a9ef..b999378 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -299,9 +299,8 @@ main (int argc, char **argv)
            scan_finished ();
            hdrflag = false;
            fclose (in);
            scan_finished ();
            hdrflag = false;
            fclose (in);

-           if (ontty  &&  fflush (stdout) == EOF) {
-               adios("stdout", "failed to fflush");
-           }
+           if (ontty)
+               fflush (stdout);

        }
     }
     charstring_free (scanl);
        }
     }
     charstring_free (scanl);

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 2d281c2..38b2ca4 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -340,14 +340,8 @@ finished:
     if (bodycomp)
        bodycomp->c_text = saved_c_text;
 
     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;
 
     cptr = fmt_findcomp ("encrypted");
     encrypted = cptr && cptr->c_text;