Commit Graph

25 Commits

Author SHA1 Message Date
Conrad Meyer
3452510890 join(1): Fix field ordering for -v output
Per POSIX, join(1) (in modes other than -o) is a concatenation of selected
character fields.  The joined field is first, followed by fields in the
order they occurred in the input files.

Our join(1) utility previously handled this correctly for lines with a match
in the other file.  But it failed to order output fields correctly for
unmatched lines, printed in -a and -v modes.

A simple test case is:

$ touch a
$ echo "2 1" > b
$ join -v2 -2 2 a b
1 2

PR:		217711
Reported by:	alt.j2-4o4s2yon at yopmail.com
Sponsored by:	Dell EMC Isilon
2017-06-22 02:19:39 +00:00
Warner Losh
fbbd9655e5 Renumber copyright clause 4
Renumber cluase 4 to 3, per what everybody else did when BSD granted
them permission to remove clause 3. My insistance on keeping the same
numbering for legal reasons is too pedantic, so give up on that point.

Submitted by:	Jan Schaumann <jschauma@stevens.edu>
Pull Request:	https://github.com/freebsd/freebsd/pull/96
2017-02-28 23:42:47 +00:00
Andrew Turner
3306f972bf Cast *tabchar, a wchar_t, to a wint_t as it is the type the %lc printf
format string expects. This is only an issue on ARM EABI where wint_t is
different to wchar_t.
2013-02-04 10:05:55 +00:00
Ed Schouten
6c9f961574 Add missing static keywords to join(1) 2011-11-06 08:15:35 +00:00
Joel Dahl
da52b4caaf Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with:	imp, rwatson
2010-12-11 08:32:16 +00:00
Maxim Konovalov
9d455d451b Backout recent -j changes, the flags is deprecated.
Requested by:	tjr
2004-08-26 06:28:05 +00:00
Maxim Konovalov
64215f652a Add -j flag to usage() and the man page synopsis.
Inspired by:	DragonFlyBSD
2004-08-25 13:15:07 +00:00
Tim J. Robbins
8160bf78a3 Add support for multibyte characters. 2004-07-05 13:20:03 +00:00
David Malone
f4ac32def2 ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.

Reviewed by:	md5
2002-09-04 23:29:10 +00:00
David E. O'Brien
e026a48c34 Consistently use FBSDID 2002-06-30 05:25:07 +00:00
Mark Murray
60d1fdaa47 Easy warns fixes; sort out some types and me them a bit more consistent;
fix initialisers.
2002-04-28 13:46:40 +00:00
Andrey A. Chernov
d969f833ed Remove <ctype.h> - not needed 2002-04-20 02:18:54 +00:00
Tim J. Robbins
fcb113145c Allow space between -a and its argument. Honour locale collating order
by using strcoll() instead of strcmp().

PR:		36270
Reviewed by:	mike
2002-04-20 01:55:19 +00:00
Juli Mallett
dcd587c927 Support -o 0 in join(1) as per SUS.
PR:		36072
Submitted by:	Tim J. Robbins <tim@robbins.dropbear.id.au>
Reviewed by:	mike
2002-03-26 03:44:04 +00:00
Warner Losh
f1bb2cd2aa remove __P 2002-03-22 01:22:50 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
Bill Fumerola
9ef5c48bef Clean up some ambiguous nested if/elses. 1999-07-04 17:26:16 +00:00
Jonathan Lemon
faba086be3 Require all compatability options to begin with '-'.
PR:		4145
1997-08-19 15:58:15 +00:00
Philippe Charnier
21a3d1655c Cosmetic in usage string. 1997-07-15 09:57:28 +00:00
Warner Losh
1c8af87873 compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.
1997-03-29 04:34:07 +00:00
Peter Wemm
6f0a860fc1 Merge from Lite2 (note: needs checking by somebody who understands join) 1997-03-11 13:45:59 +00:00
Joerg Wunsch
cefe4f6fa2 Fix a genuine off-by-one error that caused join to dump core when
trying to use field numbers tha weren't present in the input data.
1997-01-17 18:55:05 +00:00
Poul-Henning Kamp
bf6570c4a5 Don't access stuff we have realloc()'ed using the old pointer.
This is a sample of a new class of malloc usage errors that the
Junk option to phkmalloc will expose.

Found by: phkmalloc.
1996-10-21 08:51:58 +00:00
Rodney W. Grimes
7799f52a32 Remove trailing whitespace. 1995-05-30 06:41:30 +00:00
Rodney W. Grimes
9b50d90275 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00