From 1f93c9633997b8843e9b30ad29fe3b2631cf3655 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Wed, 24 Aug 2011 00:09:30 +0100 Subject: pr: fix so that LAST_PAGE is honored with -T Ever since the LAST_PAGE functionality was added in commit ed0923a1, 1996-12-05, "Apply big patch (patch-20) from Roland Huebner" it was ignored when -t or -T were specified or when -l <= 10. * src/pr.c (print_page): Increment the current page here. (print_header): Don't increment the current page here. * tests/pr/pr-tests: Add a test case. * NEWS: Mention the fix Reported at http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9347 --- src/pr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pr.c') diff --git a/src/pr.c b/src/pr.c index 771418c45..d1adc5591 100644 --- a/src/pr.c +++ b/src/pr.c @@ -1887,7 +1887,7 @@ print_page (void) print_a_FF = false; } - if (last_page_number < page_number) + if (last_page_number < ++page_number) return false; /* Stop printing with LAST_PAGE */ reset_status (); /* Change ON_HOLD to OPEN. */ @@ -2399,7 +2399,7 @@ print_header (void) /* The translator must ensure that formatting the translation of "Page %"PRIuMAX does not generate more than (sizeof page_text - 1) bytes. */ - sprintf (page_text, _("Page %"PRIuMAX), page_number++); + sprintf (page_text, _("Page %"PRIuMAX), page_number); available_width = header_width_available - mbswidth (page_text, 0); available_width = MAX (0, available_width); lhs_spaces = available_width >> 1; -- cgit v1.2.3-54-g00ecf