summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--THANKS1
-rw-r--r--src/pr.c8
-rw-r--r--tests/pr/W20l24f-ll18
4 files changed, 17 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index a22fa7a56..a52f618d1 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ GNU coreutils NEWS -*- outline -*-
symlinks when the 'LINK target' directive was given to dircolors.
[bug introduced in fileutils-4.0]
+ pr's page header was improperly formatted for long file names.
+ [bug introduced in coreutils-7.2]
+
rm -r --one-file-system works once again.
The rewrite to make rm use fts introduced a regression whereby
a commmand of the above form would fail for all subdirectories.
diff --git a/THANKS b/THANKS
index 5ed26b925..19aee6bda 100644
--- a/THANKS
+++ b/THANKS
@@ -152,6 +152,7 @@ Dawson Engler engler@stanford.edu
Dean Gaudet dean-savannah@arctic.org
Deepak Goel deego@gnufans.org
Denis Excoffier denis.excoffier@airbus.com
+Denis McKeon DMckeon@swcp.com
Dennis Henriksen opus@flamingo.osrl.dk
Dennis Smit ds@nerds-incorporated.org
Derek Clegg dclegg@next.com
diff --git a/src/pr.c b/src/pr.c
index a1b44e3f3..1b08894ec 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -2403,10 +2403,10 @@ print_header (void)
lhs_spaces = available_width >> 1;
rhs_spaces = available_width - lhs_spaces;
- printf ("\n\n%*.*s%s%*.*s%s%*.*s%s\n\n\n",
- chars_per_margin, chars_per_margin, " ",
- date_text, lhs_spaces, lhs_spaces, " ",
- file_text, rhs_spaces, rhs_spaces, " ", page_text);
+ printf ("\n\n%*s%s%*s%s%*s%s\n\n\n",
+ chars_per_margin, "",
+ date_text, lhs_spaces, " ",
+ file_text, rhs_spaces, " ", page_text);
print_a_header = false;
output_position = 0;
diff --git a/tests/pr/W20l24f-ll b/tests/pr/W20l24f-ll
index 92d08afe4..ecc9a7afc 100644
--- a/tests/pr/W20l24f-ll
+++ b/tests/pr/W20l24f-ll
@@ -1,6 +1,6 @@
--- Date/Time --xPage 1
+-- Date/Time -- x Page 1
1<<< -Test: FF's in
@@ -19,13 +19,13 @@
14<<< 123456789 123
--- Date/Time --xPage 2
+-- Date/Time -- x Page 2
--- Date/Time --xPage 3
+-- Date/Time -- x Page 3
15<<< xyzxyzxyz XYZ
@@ -44,13 +44,13 @@
28<<< trunc
--- Date/Time --xPage 4
+-- Date/Time -- x Page 4
--- Date/Time --xPage 5
+-- Date/Time -- x Page 5
29<<<xyzxyzxyz XYZXY
@@ -69,19 +69,19 @@
42<<< 123456789 abc
--- Date/Time --xPage 6
+-- Date/Time -- x Page 6
--- Date/Time --xPage 7
+-- Date/Time -- x Page 7
--- Date/Time --xPage 8
+-- Date/Time -- x Page 8
43<<< xyzxyzxyz XYZ
@@ -100,7 +100,7 @@
56<<< 123456789 abc
--- Date/Time --xPage 9
+-- Date/Time -- x Page 9
57<<< xyzxyzxyz XYZ