aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/join/join.c
Commit message (Collapse)AuthorAgeFilesLines
* General further adoption of SPDX licensing ID tags.Pedro F. Giffuni2017-11-201-0/+2
| | | | | | | | | | | | | | | | | Mainly focus on files that use BSD 3-Clause license. The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. Special thanks to Wind River for providing access to "The Duke of Highlander" tool: an older (2014) run over FreeBSD tree was useful as a starting point. Notes: svn path=/head/; revision=326025
* join(1): Fix field ordering for -v outputConrad Meyer2017-06-221-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=320210
* Renumber copyright clause 4Warner Losh2017-02-281-1/+1
| | | | | | | | | | | | 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 Notes: svn path=/head/; revision=314436
* Cast *tabchar, a wchar_t, to a wint_t as it is the type the %lc printfAndrew Turner2013-02-041-1/+1
| | | | | | | | format string expects. This is only an issue on ARM EABI where wint_t is different to wchar_t. Notes: svn path=/head/; revision=246319
* Add missing static keywords to join(1)Ed Schouten2011-11-061-34/+34
| | | | Notes: svn path=/head/; revision=227167
* Remove the advertising clause from UCB copyrighted files in usr.bin. ThisJoel Dahl2010-12-111-4/+0
| | | | | | | | | | | | 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 Notes: svn path=/head/; revision=216370
* Backout recent -j changes, the flags is deprecated.Maxim Konovalov2004-08-261-5/+4
| | | | | | | Requested by: tjr Notes: svn path=/head/; revision=134333
* Add -j flag to usage() and the man page synopsis.Maxim Konovalov2004-08-251-4/+5
| | | | | | | Inspired by: DragonFlyBSD Notes: svn path=/head/; revision=134293
* Add support for multibyte characters.Tim J. Robbins2004-07-051-6/+72
| | | | Notes: svn path=/head/; revision=131624
* ANSIify function definitions.David Malone2002-09-041-32/+17
| | | | | | | | | | | | 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 Notes: svn path=/head/; revision=102944
* Consistently use FBSDIDDavid E. O'Brien2002-06-301-2/+2
| | | | Notes: svn path=/head/; revision=99112
* Easy warns fixes; sort out some types and me them a bit more consistent;Mark Murray2002-04-281-8/+9
| | | | | | | fix initialisers. Notes: svn path=/head/; revision=95650
* Remove <ctype.h> - not neededAndrey A. Chernov2002-04-201-1/+0
| | | | Notes: svn path=/head/; revision=95098
* Allow space between -a and its argument. Honour locale collating orderTim J. Robbins2002-04-201-2/+10
| | | | | | | | | | by using strcoll() instead of strcmp(). PR: 36270 Reviewed by: mike Notes: svn path=/head/; revision=95096
* Support -o 0 in join(1) as per SUS.Juli Mallett2002-03-261-12/+25
| | | | | | | | | PR: 36072 Submitted by: Tim J. Robbins <tim@robbins.dropbear.id.au> Reviewed by: mike Notes: svn path=/head/; revision=93193
* remove __PWarner Losh2002-03-221-9/+9
| | | | Notes: svn path=/head/; revision=92920
* $Id$ -> $FreeBSD$Peter Wemm1999-08-281-1/+1
| | | | Notes: svn path=/head/; revision=50477
* Clean up some ambiguous nested if/elses.Bill Fumerola1999-07-041-2/+3
| | | | Notes: svn path=/head/; revision=48566
* Require all compatability options to begin with '-'.Jonathan Lemon1997-08-191-1/+4
| | | | | | | PR: 4145 Notes: svn path=/head/; revision=28423
* Cosmetic in usage string.Philippe Charnier1997-07-151-4/+9
| | | | Notes: svn path=/head/; revision=27422
* compare return value from getopt against -1 rather than EOF, per the finalWarner Losh1997-03-291-1/+1
| | | | | | | posix standard on the topic. Notes: svn path=/head/; revision=24360
* Merge from Lite2 (note: needs checking by somebody who understands join)Peter Wemm1997-03-111-4/+9
| | | | Notes: svn path=/head/; revision=23694
* Fix a genuine off-by-one error that caused join to dump core whenJoerg Wunsch1997-01-171-3/+3
| | | | | | | trying to use field numbers tha weren't present in the input data. Notes: svn path=/head/; revision=21811
* Don't access stuff we have realloc()'ed using the old pointer.Poul-Henning Kamp1996-10-211-2/+3
| | | | | | | | | | This is a sample of a new class of malloc usage errors that the Junk option to phkmalloc will expose. Found by: phkmalloc. Notes: svn path=/head/; revision=19069
* Remove trailing whitespace.Rodney W. Grimes1995-05-301-2/+2
| | | | Notes: svn path=/head/; revision=8874
* BSD 4.4 Lite Usr.bin SourcesRodney W. Grimes1994-05-271-0/+582
Notes: svn path=/cvs2svn/branches/CHRISTOS/; revision=1590