![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / join
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.34 / (download) - annotate - [select for diffs], Sun Dec 4 23:50:48 2022 UTC (17 months, 2 weeks ago) by cheloha
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
HEAD
Changes since 1.33: +1 -2 lines
Diff to previous 1.33 (colored)
userspace: remove vestigial '?' cases from top-level getopt(3) loops getopt(3) returns '?' when it encounters a flag not present in the in the optstring or if a flag is missing its option argument. We can handle this case with the "default" failure case with no loss of legibility. Hence, remove all the redundant "case '?':" lines. Prompted by dlg@. With help from dlg@ and millert@. Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2 ok naddy@ millert@ dlg@
Revision 1.33 / (download) - annotate - [select for diffs], Thu Jul 23 20:13:01 2020 UTC (3 years, 9 months ago) by martijn
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8
Changes since 1.32: +7 -24 lines
Diff to previous 1.32 (colored)
getline(3) does it's own memory allocation. No need to use an intermediate buffer and copy it over to the final destination. Tweaks and OK millert@, schwarze@
Revision 1.32 / (download) - annotate - [select for diffs], Wed Nov 14 15:16:09 2018 UTC (5 years, 6 months ago) by martijn
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5
Changes since 1.31: +1 -2 lines
Diff to previous 1.31 (colored)
Remove slurpit definition. Leftover from earlier cleanup by otto@.
Revision 1.31 / (download) - annotate - [select for diffs], Tue Nov 6 13:51:28 2018 UTC (5 years, 6 months ago) by martijn
Branch: MAIN
Changes since 1.30: +44 -5 lines
Diff to previous 1.30 (colored)
Allow join(1) to join on a multibyte separator. small nit and OK otto@
Revision 1.30 / (download) - annotate - [select for diffs], Tue Oct 23 08:41:45 2018 UTC (5 years, 6 months ago) by martijn
Branch: MAIN
Changes since 1.29: +5 -5 lines
Diff to previous 1.29 (colored)
Allow us to join on NULL columns. This is similar to what the other implementations do and new behaviour was most likely added by accident in r1.4. OK otto@
Revision 1.29 / (download) - annotate - [select for diffs], Thu Oct 18 09:36:48 2018 UTC (5 years, 7 months ago) by otto
Branch: MAIN
Changes since 1.28: +16 -57 lines
Diff to previous 1.28 (colored)
Fix wrong result on full and outer join, bringer us closer to the FreeBSD version. The fseek/fpos changes introduced by the 1.4 commit were not part of bsd44lite and are not needed to fix the bug. ok martijn@
Revision 1.28 / (download) - annotate - [select for diffs], Wed Jul 18 17:20:54 2018 UTC (5 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE,
OPENBSD_6_4
Changes since 1.27: +16 -12 lines
Diff to previous 1.27 (colored)
Convert from fgetln(3) to getline(3). Based on a diff from Lauri Tirkkonen. With a tweak and OK from schwarze@
Revision 1.27 / (download) - annotate - [select for diffs], Fri Oct 9 01:37:07 2015 UTC (8 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.26: +5 -5 lines
Diff to previous 1.26 (colored)
Change all tame callers to namechange to pledge(2).
Revision 1.26 / (download) - annotate - [select for diffs], Wed Oct 7 04:00:45 2015 UTC (8 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.25: +7 -1 lines
Diff to previous 1.25 (colored)
tame "stdio rpath" at the start, then potentially some files are opened. After that, tame "stdio" because that's all this program does.
Revision 1.25 / (download) - annotate - [select for diffs], Tue Jul 21 04:42:59 2015 UTC (8 years, 10 months ago) by jasper
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8
Changes since 1.24: +5 -5 lines
Diff to previous 1.24 (colored)
zap trailing whitespace
Revision 1.24 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:08 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.23: +4 -4 lines
Diff to previous 1.23 (colored)
Replace <sys/param.h> with <limits.h> and other less dirty headers where possible. Annotate <sys/param.h> lines with their current reasons. Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution. These are the files confirmed through binary verification. ok guenther, millert, doug (helped with the verification protocol)
Revision 1.23 / (download) - annotate - [select for diffs], Sat Oct 11 04:31:55 2014 UTC (9 years, 7 months ago) by doug
Branch: MAIN
Changes since 1.22: +7 -7 lines
Diff to previous 1.22 (colored)
Userland reallocarray() audit. Avoid potential integer overflow in the size argument of malloc() and realloc() by using reallocarray() to avoid unchecked multiplication. ok deraadt@
Revision 1.22 / (download) - annotate - [select for diffs], Fri Nov 15 22:20:04 2013 UTC (10 years, 6 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.21: +2 -1 lines
Diff to previous 1.21 (colored)
Include unistd.h as it is the standard location for getopt().
Revision 1.21 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:39 2009 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3,
OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.20: +1 -12 lines
Diff to previous 1.20 (colored)
rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and unmaintainable). these days, people use source. these id's do not provide any benefit, and do hurt the small install media (the 33,000 line diff is essentially mechanical) ok with the idea millert, ok dms
Revision 1.20 / (download) - annotate - [select for diffs], Tue May 29 18:29:26 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3,
OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)
remove -j from SYNOPSIS and usage(); it's deprecated and already documented in STANDARDS; ok otto
Revision 1.19 / (download) - annotate - [select for diffs], Mon Apr 23 19:21:24 2007 UTC (17 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.18: +13 -14 lines
Diff to previous 1.18 (colored)
Remove duplicate commment Simplify -j parsing Use warnx() not errx() for illegal -j option so that usage() gets called. When parsing -o don't go past the end of argv Sync usage() with man page, use __progname and make it line up nicely Based on a diff from Tobias Stoeckmann
Revision 1.18 / (download) - annotate - [select for diffs], Sun Dec 28 19:53:23 2003 UTC (20 years, 4 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1,
OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6,
OPENBSD_3_5_BASE,
OPENBSD_3_5
Changes since 1.17: +11 -4 lines
Diff to previous 1.17 (colored)
Follow Posix when writing non-matching lines. Historically, join(1) did not change the order of fields of non-matching lines if no -o option was used, but -a or -v was specified. This update writes the join field first, followed by the remaining fields of a non-matching line. This change breaks the old security(8), so don't forget to update /etc/security. From PR 2208. Testing and man page help and ok by jmc@ ok millert@ deraadt@
Revision 1.17 / (download) - annotate - [select for diffs], Fri Dec 12 10:38:44 2003 UTC (20 years, 5 months ago) by otto
Branch: MAIN
Changes since 1.16: +66 -38 lines
Diff to previous 1.16 (colored)
Update, mostly from FreeBSD: o Realloc cleanup. o Some long vs int cleanup. o Implement the Posix defined 0 as -o field value, meaning the join field. o Allow both -a 1 and -a1, and warn if the backward compatibility "-a without a number" is used. ok millert@ deraadt@
Revision 1.16 / (download) - annotate - [select for diffs], Tue Jun 10 22:20:47 2003 UTC (20 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.15: +13 -29 lines
Diff to previous 1.15 (colored)
mostly ansi cleanup; pval ok
Revision 1.15 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:09 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.14: +3 -7 lines
Diff to previous 1.14 (colored)
Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo.
Revision 1.14 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:47 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE,
OPENBSD_3_3,
OPENBSD_3_2_BASE,
OPENBSD_3_2,
OPENBSD_3_1_BASE,
OPENBSD_3_1
Changes since 1.13: +12 -12 lines
Diff to previous 1.13 (colored)
Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
Revision 1.13 / (download) - annotate - [select for diffs], Mon Jan 29 01:57:59 2001 UTC (23 years, 3 months ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE,
OPENBSD_3_0,
OPENBSD_2_9_BASE,
OPENBSD_2_9
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)
$OpenBSD$
Revision 1.12 / (download) - annotate - [select for diffs], Fri Jul 23 23:37:34 1999 UTC (24 years, 10 months ago) by aaron
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE,
OPENBSD_2_8,
OPENBSD_2_7_BASE,
OPENBSD_2_7,
OPENBSD_2_6_BASE,
OPENBSD_2_6
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)
fieldcnt is the number of fields, not +1... this one was missed in 1995 when the other two were fixed
Revision 1.11 / (download) - annotate - [select for diffs], Mon Nov 16 06:09:12 1998 UTC (25 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE,
OPENBSD_2_5
Changes since 1.10: +6 -5 lines
Diff to previous 1.10 (colored)
more -Wall
Revision 1.10 / (download) - annotate - [select for diffs], Mon Aug 25 05:31:10 1997 UTC (26 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE,
OPENBSD_2_4,
OPENBSD_2_3_BASE,
OPENBSD_2_3,
OPENBSD_2_2_BASE,
OPENBSD_2_2
Changes since 1.9: +5 -2 lines
Diff to previous 1.9 (colored)
require compat opts start with -; bug from kh@mogami-wire.co.jp; fix from freebsd
Revision 1.9 / (download) - annotate - [select for diffs], Thu Jul 24 01:35:30 1997 UTC (26 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.8: +3 -3 lines
Diff to previous 1.8 (colored)
argh
Revision 1.8 / (download) - annotate - [select for diffs], Wed Jul 23 02:59:33 1997 UTC (26 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)
arg parsing bug in compat code; kh@mogami-wire.co.jp
Revision 1.7 / (download) - annotate - [select for diffs], Wed Apr 9 16:42:25 1997 UTC (27 years, 1 month ago) by michaels
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE,
OPENBSD_2_1
Changes since 1.6: +17 -16 lines
Diff to previous 1.6 (colored)
just clean up a stylistic mess I created myself long ago.
Revision 1.6 / (download) - annotate - [select for diffs], Wed Jan 15 23:42:38 1997 UTC (27 years, 4 months ago) by millert
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)
getopt(3) returns -1 when out of args, not EOF, whee!
Revision 1.5 / (download) - annotate - [select for diffs], Mon Aug 12 16:37:00 1996 UTC (27 years, 9 months ago) by michaels
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE,
OPENBSD_2_0
Changes since 1.4: +21 -17 lines
Diff to previous 1.4 (colored)
remove dead code, add comments, put back original comments (Cthulu may know how they were lost).
Revision 1.4 / (download) - annotate - [select for diffs], Mon Aug 12 02:31:53 1996 UTC (27 years, 9 months ago) by michaels
Branch: MAIN
Changes since 1.3: +183 -175 lines
Diff to previous 1.3 (colored)
on Theo's suggestion replaced join with join from 44lite, fixed (?) netbsd pr #1356 (reported by mouse@Collatz.McRCIM.McGill.EDU, der Mouse)
Revision 1.3 / (download) - annotate - [select for diffs], Wed Jun 26 05:34:39 1996 UTC (27 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.2: +3 -1 lines
Diff to previous 1.2 (colored)
rcsid
Revision 1.2 / (download) - annotate - [select for diffs], Fri Dec 22 19:02:55 1995 UTC (28 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +3 -3 lines
Diff to previous 1.1 (colored)
fieldcnt is number of fields, not +1; from mouse@Collatz.McRCIM.McGill.EDU; netbsd pr#1356
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:45:26 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)
initial import of NetBSD tree
Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:45:26 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN
Initial revision