CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 18:56:39 +02:00
Code Issues Projects Releases Wiki Activity

join: ensure --header skips the order check with empty files

Browse Source 
* src/join.c: Skip the header even if one of the files is empty.
* tests/misc/join: Add a test case.
* NEWS: Mention the fix
This commit is contained in:
Pádraig Brady
2011-01-14 08:46:21 +00:00
parent d4db0cb182
commit 32626bde6d
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -10,6 +10,9 @@ GNU coreutils NEWS -*- outline -*-
argument following the one containing the moved sub-tree.
[bug introduced in coreutils-5.1.0]
join --header now skips the ordering check for the first line
even if the other file is empty. [bug introduced in coreutils-8.5]
rm -f no longer fails for EINVAL or EILSEQ on file systems that
reject file names invalid for that file system.

12
src/join.c
View File

@@ -648,13 +648,17 @@ join (FILE *fp1, FILE *fp2)
autocount_2 = seq2.count ? seq2.lines[0]->nfields : 0;
}
if (join_header_lines && seq1.count && seq2.count)
if (join_header_lines && (seq1.count || seq2.count))
{
prjoin (seq1.lines[0], seq2.lines[0]);
struct line const *hline1 = seq1.count ? seq1.lines[0] : &uni_blank;
struct line const *hline2 = seq2.count ? seq2.lines[0] : &uni_blank;
prjoin (hline1, hline2);
prevline[0] = NULL;
prevline[1] = NULL;
advance_seq (fp1, &seq1, true, 1);
advance_seq (fp2, &seq2, true, 2);
if (seq1.count)
advance_seq (fp1, &seq1, true, 1);
if (seq2.count)
advance_seq (fp2, &seq2, true, 2);
}
while (seq1.count && seq2.count)

6
tests/misc/join
View File

@@ -239,6 +239,12 @@ my @tv = (
[ "ID1 Name\n1 A\n2 B\n", "ID2 Color\n1 red\n"],
"ID1 Name Color\n1 A red\n", 0],
# '--header' doesn't check order of a header
# even if there is no header in the second file
['header-6', '--header -a1',
[ "ID1 Name\n1 A\n", ""],
"ID1 Name\n1 A\n", 0],
);
# Convert the above old-style test vectors to the newer