OpenBSD CVS

CVS log for src/usr.bin/sort/Attic/msort.c


[BACK] Up to [local] / src / usr.bin / sort

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.26, Tue Mar 17 17:45:13 2015 UTC (9 years, 2 months ago) by millert
Branch: MAIN
CVS Tags: HEAD
Changes since 1.25: +1 -1 lines
FILE REMOVED

Initial import of FreeBSD sort.

Revision 1.25 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:12 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.24: +3 -1 lines
Diff to previous 1.24 (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.24 / (download) - annotate - [select for diffs], Wed Nov 13 15:07:27 2013 UTC (10 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)

repair buffer resizing "undershoot", and some minor issues with
math on void *
assistance from guenther, ok millert

Revision 1.23 / (download) - annotate - [select for diffs], Tue Dec 22 19:47:02 2009 UTC (14 years, 4 months ago) by schwarze
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.22: +13 -6 lines
Diff to previous 1.22 (colored)

implement -C (silent -c), required by POSIX.1-2008;
patch from Daniel Dickman <didickman at gmail dot com> tweaked by me;
"looks ok" millert@, manual help and ok jmc@

Revision 1.22 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:43 2009 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.21: +1 -9 lines
Diff to previous 1.21 (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.21 / (download) - annotate - [select for diffs], Tue Aug 21 20:29:25 2007 UTC (16 years, 9 months ago) by millert
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
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

Add a -s option to make the radix sort be a stable sort.  Based on
a diff from Eric Gouyer.  Closes PR 5553.  OK deraadt@

Revision 1.20 / (download) - annotate - [select for diffs], Tue Mar 13 17:33:58 2007 UTC (17 years, 2 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.19: +17 -27 lines
Diff to previous 1.19 (colored)

Use separate buffers in fsort.c and msort.c.  Fixes a problem with
buffer corruptions for some very large files.  Also fixes some
TRECHEADER vs. RECHEADER mismatches.  Back in after unlock.

Revision 1.19 / (download) - annotate - [select for diffs], Sun Mar 11 00:38:01 2007 UTC (17 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.18: +25 -15 lines
Diff to previous 1.18 (colored)

some bug (in sort?  or compiler) gets hit too late in the release cycle.
please try again right after release.

Revision 1.18 / (download) - annotate - [select for diffs], Wed Mar 7 18:11:03 2007 UTC (17 years, 2 months ago) by millert
Branch: MAIN
Changes since 1.17: +17 -27 lines
Diff to previous 1.17 (colored)

Use separate buffers in fsort.c and msort.c.  Fixes a problem with
buffer corruptions for some very large files.  Also fixes some
TRECHEADER vs. RECHEADER mismatches.  OK deraadt@ otto@ ray@

Revision 1.17 / (download) - annotate - [select for diffs], Sun Oct 29 18:40:34 2006 UTC (17 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.16: +13 -13 lines
Diff to previous 1.16 (colored)

Remove useless code that can cause a SEGV if a buffer is realloc()ed.
Allocate buffers early and in one place instead of two.
Make bufend global so it can be updated along with buffer.
OK deraadt@

Revision 1.16 / (download) - annotate - [select for diffs], Sat Oct 28 21:14:29 2006 UTC (17 years, 6 months ago) by naddy
Branch: MAIN
Changes since 1.15: +15 -13 lines
Diff to previous 1.15 (colored)

revert previous change; causes segfault when called from
pkg_mklocatedb/locate.mklocatedb

Revision 1.15 / (download) - annotate - [select for diffs], Wed Oct 18 23:30:43 2006 UTC (17 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.14: +13 -15 lines
Diff to previous 1.14 (colored)

Remove useless code that can cause a SEGV if a buffer is realloc()ed.
Allocate buffers early and in one place instead of two.
Fixes PR 5252; OK deraadt

Revision 1.14 / (download) - annotate - [select for diffs], Tue Jul 20 03:50:27 2004 UTC (19 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: 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
Changes since 1.13: +14 -24 lines
Diff to previous 1.13 (colored)

ansi; khalek@linuxgamers.net

Revision 1.13 / (download) - annotate - [select for diffs], Thu Jun 26 00:12:39 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5, OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.12: +6 -7 lines
Diff to previous 1.12 (colored)

protos

Revision 1.12 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:16 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.11: +3 -7 lines
Diff to previous 1.11 (colored)

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999.  Proofed by myself and Theo.

Revision 1.11 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:52 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.10: +4 -4 lines
Diff to previous 1.10 (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.10 / (download) - annotate - [select for diffs], Fri Jan 4 16:33:14 2002 UTC (22 years, 4 months ago) by art
Branch: MAIN
Changes since 1.9: +7 -6 lines
Diff to previous 1.9 (colored)

Align the pointers when splitting up a mallocated area.
Cures alignment faults on alpha and sparc64.
OK: niklas@ ericj@ millert@

Revision 1.9 / (download) - annotate - [select for diffs], Sun Feb 4 21:27:01 2001 UTC (23 years, 3 months ago) by ericj
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.8: +21 -13 lines
Diff to previous 1.8 (colored)


Bring in some recent fixup's from NetBSD. This allows lines longer than 65522
to be properly sorted. Many other cleanup's done, and depreciate register.
millert@ and deraadt@ ok.

Revision 1.7.4.1 / (download) - annotate - [select for diffs], Fri Oct 6 21:16:17 2000 UTC (23 years, 7 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored) next main 1.8 (colored)

Pull in patch from current (even more to come):
Fix (millert):
warnx?/errx? paranoia (use "%s" not a bare string unless it is a
constant).  These are not security holes but it is worth fixing
them anyway both for robustness and so folks looking for examples
in the tree are not misled into doing something potentially dangerous.
Furthermore, it is a bad idea to assume that pathnames will not
include '%' in them and that error routines don't return strings
with '%' in them (especially in light of the possibility of locales).

Revision 1.8 / (download) - annotate - [select for diffs], Fri Jun 30 16:00:23 2000 UTC (23 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)

warnx?/errx? paranoia (use "%s" not a bare string unless it is a
constant).  These are not security holes but it is worth fixing
them anyway both for robustness and so folks looking for examples
in the tree are not misled into doing something potentially dangerous.
Furthermore, it is a bad idea to assume that pathnames will not
include '%' in them and that error routines don't return strings
with '%' in them (especially in light of the possibility of locales).

Revision 1.7 / (download) - annotate - [select for diffs], Mon May 24 17:57:18 1999 UTC (25 years ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_6_BASE, OPENBSD_2_6
Branch point for: OPENBSD_2_7
Changes since 1.6: +18 -9 lines
Diff to previous 1.6 (colored)

Dynamically allocate memory for structures whose sizes are based on the
number of keys given.  Closes PR #825.

Revision 1.6 / (download) - annotate - [select for diffs], Mon Jun 30 05:36:17 1997 UTC (26 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5, OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3, OPENBSD_2_2_BASE, OPENBSD_2_2
Changes since 1.5: +9 -9 lines
Diff to previous 1.5 (colored)

64bit fixes.  Some of these are a bit bogus as there were "long"s
meant to be file offsets for fseek(3).  However, those values
could never be > an int anyay so it is not a problem.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Jun 30 04:24:40 1997 UTC (26 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

Fix an unaligned access on alpha.

Revision 1.4 / (download) - annotate - [select for diffs], Mon Jun 16 02:21:56 1997 UTC (26 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.3: +25 -23 lines
Diff to previous 1.3 (colored)

Cosmetic cleanup, mostly KNF.

Revision 1.3 / (download) - annotate - [select for diffs], Wed Jan 22 06:53:15 1997 UTC (27 years, 4 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.2: +3 -3 lines
Diff to previous 1.2 (colored)

Fix some err(3) usage and usage string.

Revision 1.2 / (download) - annotate - [select for diffs], Wed Jan 22 06:43:53 1997 UTC (27 years, 4 months ago) by millert
Branch: MAIN
Changes since 1.1: +20 -17 lines
Diff to previous 1.1 (colored)

Fix off-by-one differently--add an extra byte to buffer (ick).
Don't dump core on empty file.

Revision 1.1 / (download) - annotate - [select for diffs], Mon Jan 20 19:39:53 1997 UTC (27 years, 4 months ago) by millert
Branch: MAIN

sort(1) from 4.4BSD-lite2 with minor tweaks and bug fixes by me.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.