Commit Graph

31 Commits

Author SHA1 Message Date
joerg
d6555585cf static + __dead 2011-09-04 20:27:05 +00:00
lukem
1afaa212d9 Fix WARNS=4 issues (-Wcast-qual -Wsign-compare) 2009-04-12 11:18:21 +00:00
lukem
98e5374ccb Remove the \n and tabs from the __COPYRIGHT() strings.
Tweak to use a consistent format.
2008-07-21 14:19:20 +00:00
hubertf
e730edb6a7 Be a good citizen and close files that are no longer used.
Also s/exit/return/;

Filedescriptor patch from Slava Semushin <slava.semushin@gmail.com>,
return-change and testing by me.
2007-02-21 20:45:27 +00:00
apb
a059c305e2 Include nbtool_config.h, to make join(1) buildable as a host tool. 2007-01-14 16:15:26 +00:00
perry
10e955c2f8 de-__P, ANSIfy prototypes 2006-01-04 01:44:06 +00:00
wiz
4e4e99275b Add missing -j to usage; sort as in man page;
use getprogname(). From Kouichirou Hiratsuka in PR 26220.
2004-07-13 11:53:57 +00:00
itojun
50847da5c5 safer use of realloc 2003-10-16 06:56:17 +00:00
agc
89aaa1bb64 Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22365, verified by myself.
2003-08-07 11:13:06 +00:00
wiz
4880d466e5 Remove duplicate unistd.h inclusion. Igor Sobrado, PR 21300. 2003-04-24 08:22:05 +00:00
jonb
0fb6a2fdff finish fixing PR#15412 2002-07-24 17:03:00 +00:00
jonb
549323fedc Make the -v flag print data instead of blank lines. Thanks to
Duncan McEwan <duncan@mcs.vuw.ac.nz> for the hint in PR#15412.
I'll leave the rest of his patch for someone more familiar
with join to fix.
2002-02-14 03:21:07 +00:00
mycroft
f11e179e71 Fix another off-by-one error, attempting to output a non-existant field. 2000-06-10 19:21:05 +00:00
mycroft
a02b2cb6d8 Small bug fixes:
* Allow , as a separator in the output field list.
* If we try to compare two fields that are not present in *either* file,
  consider it a match.
2000-06-10 19:15:15 +00:00
mycroft
5c886053bc Don't step off into space after a realloc(). (Get rid of `lastlp'.)
Also, allocate more data in powers of 2.
2000-06-10 19:03:22 +00:00
tron
c8b0d04949 Fix wrong array size calculation in call to memset() and avoid a possible
segmentation fault in memmove(). Patches supplied by Stephan Thesing in
PR bin/8184.
1999-08-10 20:09:02 +00:00
christos
0d9bacd536 gcc-2.8.1 wants more braces 1998-12-19 17:05:30 +00:00
wsanchez
d213a54fe9 include unistd.h 1998-10-13 17:02:16 +00:00
ross
f670fa10c5 Add { and } to shut up egcs. Reformat the more questionable code. 1998-08-25 20:59:36 +00:00
perry
b7110dfa46 add <unistd.h> to fix compiler warning 1998-02-03 03:47:47 +00:00
lukem
ac4e9aa74a WARNSify, fix .Nm usage, deprecate register, use <err.h> 1997-10-19 03:32:11 +00:00
tls
9bb9a57573 revert to pre-merged version due to bugs; will fix. 1997-01-13 20:57:48 +00:00
tls
9d225a1783 RCS ID police 1997-01-09 20:18:21 +00:00
tls
20d490585f Sync to 4.4BSD Lite-2 (minus a number of conflicting bugfixes) 1997-01-09 13:29:56 +00:00
mycroft
1a97a35609 Fix off-by-one error in checking field numbers. From der Mouse, PR 1356. 1996-02-08 18:24:16 +00:00
cgd
02254e0c37 rename fgetline() and sharpen axe for bostic... 1994-01-04 05:16:44 +00:00
cgd
a60129f588 update for fgetline 1993-12-22 07:23:27 +00:00
cgd
cf60e8dfa8 fix from Dave Matthews <dave@prlng.co.uk>, with modifications by cgd:
Bug Description:
	Two different bugs in join.  One causes a segmentation fault if
	increasing the space by 100 is not enough.  The other gives the
	wrong results because the program saves a pointer to the original
	buffer rather than to the area where the lines have been copied.
1993-11-15 09:30:52 +00:00
jtc
2ddbb97f0f #include <unistd.h>, so getopt(), optarg, opterr, optind, and optopt
declarations can be removed from <stdlib.h>.
1993-10-13 18:33:45 +00:00
mycroft
e9d867ef50 Add RCS identifiers. 1993-08-01 17:54:45 +00:00
glass
f7d7921aae join from ftp.uu.net:bsd-sources integrated 1993-04-30 08:04:31 +00:00