From cc11d2ef51aa33a4eb61d83f6d75b90daed22aa2 Mon Sep 17 00:00:00 2001 From: scrappy Date: Tue, 22 Oct 1996 05:02:01 +0000 Subject: Fixes: When you ask pr to use form feeds at the end of pages and specify a page length and tell pr to not put the fancy headers and footers on each pages, then pr will not separate the pages with a form feed. Closes PR: bin/1237 Submitted by: Warner Losh --- usr.bin/pr/pr.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'usr.bin/pr') diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c index 3da319c..decaaed 100644 --- a/usr.bin/pr/pr.c +++ b/usr.bin/pr/pr.c @@ -1457,16 +1457,23 @@ prtail(cnt, incomp) /* * only pad with no headers when incomplete last line */ - if (!incomp) - return(0); - if ((dspace && (putchar('\n') == EOF)) || - (putchar('\n') == EOF)) { + if (incomp && + ((dspace && (putchar('\n') == EOF)) || + (putchar('\n') == EOF))) { pfail(); return(1); } + /* + * but honor the formfeed request + */ + if (formfeed) { + if (putchar('\f') == EOF) { + pfail(); + return(1); + } + } return(0); } - /* * if double space output two \n */ -- cgit v1.1