bekucera/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-09-10 07:59:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

pr: fix a bug whereby --indent=N (-o) did not indent header lines

Browse Source 
* src/pr.c (print_header): Honor chars_per_margin also for the header.
Inspired by a patch from C de-Avillez.
This change also adjusts two other %*s directives to be %*.*s instead,
(for the padding on either side of "file_text") to correct a bug that
could make pr print one space of padding instead of none.
* NEWS (Bug fixes): Mention it.
* tests/pr/o3Jml24f-lm-lo: Adjust for new expected output.
* tests/pr/o3a3Sl24f-tn: Likewise.
* tests/pr/o3a3Snl24f-tn: Likewise.
* tests/pr/o3a3l24f-tn: Likewise.
* tests/pr/o3b3Sl24f-tn: Likewise.
* tests/pr/o3b3Snl24f-tn: Likewise.
* tests/pr/o3b3l24f-tn: Likewise.
* tests/pr/o3mSl24f-bl-tn: Likewise.
* tests/pr/o3mSnl24fbltn: Likewise.
* tests/pr/o3ml24f-bl-tn: Likewise.
This commit is contained in:
Jim Meyering
2009-03-06 20:03:26 +01:00
parent 85507b24f9
commit a4053c5291
14 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -9,6 +9,9 @@ GNU coreutils NEWS -*- outline -*-
The bug strikes only with both --recursive (-r, -R) and --link (-l).
[bug introduced in coreutils-7.1]
pr: fix the bug whereby --indent=N (-o) did not indent header lines
[bug introduced in coreutils-6.9.90]
sort now handles specified key ends correctly.
Previously -k1,1b would have caused leading space from field 2 to be
included in the sort while -k2,3.0 would have not included field 3.

1
THANKS
View File

@@ -89,6 +89,7 @@ Brian Youmans 3diff@gnu.org
Bruce Korb bkorb@veritas.com
Bruce Robertson brucer@theodolite.dyndns.org
Bruno Haible haible@clisp.cons.org
C de-Avillez hggdh2@gmail.com
Carl Johnson carlj@cjlinux.home.org
Carl Lowenstein cdl@mpl.UCSD.EDU
Carl Roth roth@urs.us

6
src/pr.c
View File

@@ -2402,8 +2402,10 @@ print_header (void)
lhs_spaces = available_width >> 1;
rhs_spaces = available_width - lhs_spaces;
printf ("\n\n%s%*s%s%*s%s\n\n\n",
date_text, lhs_spaces, " ", file_text, rhs_spaces, " ", page_text);
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);
print_a_header = false;
output_position = 0;

18
tests/pr/W20l24f-ll
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time --xPage 1
1<<< -Test: FF's in
@@ -19,13 +19,13 @@
14<<< 123456789 123
-- Date/Time -- x Page 2
-- Date/Time --xPage 2
-- Date/Time -- x Page 3
-- Date/Time --xPage 3
15<<< xyzxyzxyz XYZ
@@ -44,13 +44,13 @@
28<<< trunc
-- Date/Time -- x Page 4
-- Date/Time --xPage 4
-- Date/Time -- x Page 5
-- Date/Time --xPage 5
29<<<xyzxyzxyz XYZXY
@@ -69,19 +69,19 @@
42<<< 123456789 abc
-- Date/Time -- x Page 6
-- Date/Time --xPage 6
-- Date/Time -- x Page 7
-- Date/Time --xPage 7
-- Date/Time -- x Page 8
-- Date/Time --xPage 8
43<<< xyzxyzxyz XYZ
@@ -100,7 +100,7 @@
56<<< 123456789 abc
-- Date/Time -- x Page 9
-- Date/Time --xPage 9
57<<< xyzxyzxyz XYZ

18
tests/pr/o3Jml24f-lm-lo
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1<<< -Test: FF's in Text >>> 1::: Test-INPUT: "Without FF set by Hand" :::
@@ -19,7 +19,7 @@
14<<< 123456789 123456789 123456789 >>> 14::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 :::
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
15::: xyzxyzxyz XYZXYZXYZ abcabcab :::
@@ -38,7 +38,7 @@
28::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 :::
-- Date/Time -- x Page 3
-- Date/Time -- x Page 3
15<<< xyzxyzxyz XYZXYZXYZ abcabcab >>> 29::: xyzxyzxyz XYZXYZXYZ abcabcab :::
@@ -57,7 +57,7 @@
28<<< trunc 42::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 :::
-- Date/Time -- x Page 4
-- Date/Time -- x Page 4
43::: xyzxyzxyz XYZXYZXYZ abcabcab :::
@@ -76,7 +76,7 @@
56::: 89 123456789 123456789 123456789 123456789 123456789 123456789 1234567890 :::
-- Date/Time -- x Page 5
-- Date/Time -- x Page 5
29<<<xyzxyzxyz XYZXYZXYZ abcabcab >>> 57::: xyzxyzxyz XYZXYZXYZ abcabcab :::
@@ -95,19 +95,19 @@
42<<< 123456789 abcdefghi ABCDEDFHI >>>
-- Date/Time -- x Page 6
-- Date/Time -- x Page 6
-- Date/Time -- x Page 7
-- Date/Time -- x Page 7
-- Date/Time -- x Page 8
-- Date/Time -- x Page 8
43<<< xyzxyzxyz XYZXYZXYZ abcabcab >>>
@@ -126,7 +126,7 @@
56<<< 123456789 abcdefghi ABCDEDFHI >>>
-- Date/Time -- x Page 9
-- Date/Time -- x Page 9
57<<< xyzxyzxyz XYZXYZXYZ abcabcab >>>

4
tests/pr/o3a3Sl24f-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1 Test-INPUT: "With:--:2 Options -b -3 [+2:--:3 Options -a -3 [+2
@@ -19,7 +19,7 @@
40 DEFGHI 123456789 :--:41 yzxyzxyz XYZXYZXYZ:--:42 456789 123456789 a
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
43 xyzxyzxyz XYZXYZXY:--:44 456789 123456789 x:--:5

4
tests/pr/o3a3Snl24f-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1.1 Test-INPUT::--: 2.2 Options -b :--: 3.3 Options -a
@@ -19,7 +19,7 @@
40.40 DEFGHI 12345:--: 41.41 yzxyzxyz XYZ:--: 42.42 456789 12345
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
43.43 xyzxyzxyz XY:--: 44.44 456789 12345:--: 45.5

4
tests/pr/o3a3l24f-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1 Test-INPUT: "Withou 2 Options -b -3 [+2|+ 3 Options -a -3 [+2|+
@@ -19,7 +19,7 @@
40 DEFGHI 123456789 41 yzxyzxyz XYZXYZXYZ a 42 456789 123456789 abc
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
43 xyzxyzxyz XYZXYZXYZ 44 456789 123456789 xyz 5

4
tests/pr/o3b3Sl24f-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1 Test-INPUT: "With:--:15 xyzxyzxyz XYZXYZXY:--:29 xyzxyzxyz XYZXYZXY
@@ -19,7 +19,7 @@
14 456789 123456789 1:--:28 no trunc :--:42 456789 123456789 a
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
43 xyzxyzxyz XYZXYZXY:--:50 :--:57 xyzxyzxyz XYZXYZXY

4
tests/pr/o3b3Snl24f-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1.1 Test-INPUT::--: 15.15 xyzxyzxyz XY:--: 29.29 xyzxyzxyz XY
@@ -19,7 +19,7 @@
14.14 456789 12345:--: 28.28 no trunc :--: 42.42 456789 12345
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
43.43 xyzxyzxyz XY:--: 50.50 :--: 57.57 xyzxyzxyz XY

4
tests/pr/o3b3l24f-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1 Test-INPUT: "Withou 15 xyzxyzxyz XYZXYZXYZ 29 xyzxyzxyz XYZXYZXYZ
@@ -19,7 +19,7 @@
14 456789 123456789 123 28 no trunc 42 456789 123456789 abc
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
43 xyzxyzxyz XYZXYZXYZ 50 57 xyzxyzxyz XYZXYZXYZ

20
tests/pr/o3mSl24f-bl-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1 FF-Test: FF's in Text :--:1 Test-INPUT: "Without FF set by
@@ -19,7 +19,7 @@
14 456789 123456789 123456789 1234:--:14 456789 123456789 123456789 1234
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
:--:15 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -38,7 +38,7 @@
:--:28 no trunc
-- Date/Time -- x Page 3
-- Date/Time -- x Page 3
15 xyzxyzxyz XYZXYZXYZ abcabcab :--:29 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -57,7 +57,7 @@
:--:42 456789 123456789 abcdefghi ABCD
-- Date/Time -- x Page 4
-- Date/Time -- x Page 4
:--:43 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -76,7 +76,7 @@
:--:56 456789 123456789 abcdefghi ABCD
-- Date/Time -- x Page 5
-- Date/Time -- x Page 5
29 xyzxyzxyz XYZXYZXYZ abcabcab :--:57 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -95,19 +95,19 @@
42 456789 123456789 abcdefghi ABCD
-- Date/Time -- x Page 6
-- Date/Time -- x Page 6
-- Date/Time -- x Page 7
-- Date/Time -- x Page 7
-- Date/Time -- x Page 8
-- Date/Time -- x Page 8
43 xyzxyzxyz XYZXYZXYZ abcabcab :--:
@@ -126,7 +126,7 @@
56 456789 123456789 abcdefghi ABCD
-- Date/Time -- x Page 9
-- Date/Time -- x Page 9
:--:
@@ -145,7 +145,7 @@
70 456789 123456789 abcdefghi ABC:--:
-- Date/Time -- x Page 10
-- Date/Time -- x Page 10
1 :--:

20
tests/pr/o3mSnl24fbltn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1.1 FF-Test: FF's in Text :--:1 Test-INPUT: "Without FF set
@@ -19,7 +19,7 @@
14.14 456789 123456789 123456789 1:--:14 456789 123456789 123456789 1
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
15. :--:15 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -38,7 +38,7 @@
28. :--:28 no trunc
-- Date/Time -- x Page 3
-- Date/Time -- x Page 3
29.15 xyzxyzxyz XYZXYZXYZ abcabcab:--:29 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -57,7 +57,7 @@
42. :--:42 456789 123456789 abcdefghi A
-- Date/Time -- x Page 4
-- Date/Time -- x Page 4
43. :--:43 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -76,7 +76,7 @@
56. :--:56 456789 123456789 abcdefghi A
-- Date/Time -- x Page 5
-- Date/Time -- x Page 5
57.29 xyzxyzxyz XYZXYZXYZ abcabcab:--:57 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -95,19 +95,19 @@
70.42 456789 123456789 abcdefghi A
-- Date/Time -- x Page 6
-- Date/Time -- x Page 6
-- Date/Time -- x Page 7
-- Date/Time -- x Page 7
-- Date/Time -- x Page 8
-- Date/Time -- x Page 8
71.43 xyzxyzxyz XYZXYZXYZ abcabcab:--:
@@ -126,7 +126,7 @@
84.56 456789 123456789 abcdefghi A
-- Date/Time -- x Page 9
-- Date/Time -- x Page 9
85. :--:
@@ -145,7 +145,7 @@
98.70 456789 123456789 abcdefghi :--:
-- Date/Time -- x Page 10
-- Date/Time -- x Page 10
99.1 :--:

20
tests/pr/o3ml24f-bl-tn
View File

@@ -1,6 +1,6 @@
-- Date/Time -- x Page 1
-- Date/Time -- x Page 1
1 FF-Test: FF's in Text 1 Test-INPUT: "Without FF set by
@@ -19,7 +19,7 @@
14 456789 123456789 123456789 12345 14 456789 123456789 123456789 12345
-- Date/Time -- x Page 2
-- Date/Time -- x Page 2
15 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -38,7 +38,7 @@
28 no trunc
-- Date/Time -- x Page 3
-- Date/Time -- x Page 3
15 xyzxyzxyz XYZXYZXYZ abcabcab 29 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -57,7 +57,7 @@
42 456789 123456789 abcdefghi ABCDE
-- Date/Time -- x Page 4
-- Date/Time -- x Page 4
43 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -76,7 +76,7 @@
56 456789 123456789 abcdefghi ABCDE
-- Date/Time -- x Page 5
-- Date/Time -- x Page 5
29 xyzxyzxyz XYZXYZXYZ abcabcab 57 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -95,19 +95,19 @@
42 456789 123456789 abcdefghi ABCDE
-- Date/Time -- x Page 6
-- Date/Time -- x Page 6
-- Date/Time -- x Page 7
-- Date/Time -- x Page 7
-- Date/Time -- x Page 8
-- Date/Time -- x Page 8
43 xyzxyzxyz XYZXYZXYZ abcabcab
@@ -126,7 +126,7 @@
56 456789 123456789 abcdefghi ABCDE
-- Date/Time -- x Page 9
-- Date/Time -- x Page 9
@@ -145,7 +145,7 @@
70 456789 123456789 abcdefghi ABCD
-- Date/Time -- x Page 10
-- Date/Time -- x Page 10
1