jdolecek
9c52662e24
fsort(): don't call append() with zero nelem
...
This fixes the 'sort -f /dev/null' coredump reported on current-users.
2001-02-20 18:33:09 +00:00
jdolecek
affba8f2e9
Pull up various cosmetic (mostly whitespace) changes from OpenBSD.
...
This is primarily to ease syncing the two versions.
2001-02-19 20:50:17 +00:00
jdolecek
e1a2c672d7
oops - wrong file, backoff local test change
2001-02-19 19:39:53 +00:00
jdolecek
552af1f3f4
enterkey():
...
* move the test for keybuf size before keypos[-1] assignment, "just in case"
* move the keypos assignment to improve readability
2001-02-19 19:36:59 +00:00
jdolecek
7f547730fd
cosmetic changes - make keylist[] static and remove extern definition
...
in fsort.h, move macro SALIGN() from sort.h to fsort.c
2001-02-19 19:31:29 +00:00
itojun
eb99cc701b
make sure to initialize malloc'ed region. PR 12138. found by malloc.conf=AJ
2001-02-05 14:25:34 +00:00
jdolecek
07eff1f96d
use MERGE_FNUM instead of magic value 16
2001-01-19 10:13:21 +00:00
jdolecek
90f3e08483
keep bumping the record buffer up to 8 records - this is to avoid making
...
excessive number of temporary files for oversized records; the way the
buffer is enlarged is now also safer
initialize 'bufsize' statically, so that the value can be safely used
in e.g. msort.c:fmerge()
2001-01-18 21:40:15 +00:00
itojun
8dd4895415
fix few confusing indentation. XXX still broken
2001-01-13 17:27:21 +00:00
jdolecek
1c216f18ea
general cleanup of file list passing:
...
* get rid of union f_handle, replace by passing explicit int parameter
and (new) struct filelist
* add new typedefs gen_func_t and put_func_t and use where appropriate
2001-01-11 14:05:24 +00:00
jdolecek
e4de90b20d
by default, use stable sort
...
add -S flag to switch to non-stable sort; for GNU sort compatibility,
provide -s flag too
2001-01-08 18:00:31 +00:00
jdolecek
c477768e0b
fix bugs caused by implicit assumption that 'length' and
...
'offset' members of struct recheader/trecheader are shorts - they are size_t
now
this makes sort pass all tests in TEST/stests again after my last change
other misc cosmetic changes
2000-10-17 15:22:57 +00:00
jdolecek
ab259a291a
enlarge line buffer as necessary, so that it's possible
...
to process lines longer than 65522 characters
constify, rename MAXLLEN to DEFLLEN
2000-10-16 21:53:19 +00:00
jdolecek
681fb9cb36
don't use register declarations
2000-10-15 20:46:33 +00:00
bjh21
e5218d1719
Two classes of changes from the initial OpenBSD commit of this sort(1):
...
FILE * variables are called "fp" rather than "fd".
Better (safer) temporary-file handling.
2000-10-07 20:37:06 +00:00
bjh21
6029888a3a
Hit sort(1) with a hammer till it compiles.
...
Also add RCSIDs.
2000-10-07 18:37:09 +00:00
bjh21
1d5d9b5b60
4.4BSD-Lite2 contrib/sort
2000-10-07 16:39:34 +00:00