992d55d2a8
* Use krb5_warn() instead of non-functional com_err().
...
* knf patrol
* De-__P()
2001-01-19 21:55:19 +00:00
1dcd879fa8
Make files here compile again.
2001-01-19 14:14:03 +00:00
d14e283f81
- move the mmap playing code into new play() function
...
- be more (properly) quiet with `-q'
2001-01-19 14:11:56 +00:00
f65ee1b182
merge(): use array of buffers instead of one big buffer for all records, and
...
enlarge them as necessary to read records from merged files; the buffers
are allocated once per program run, so there shouldn't be any
performance difference
This makes sort(1) pass also regression 40B and should make it
fully arbitrary long record capable.
XXX the buffer array could probably be freed on end of fmerge() to save memory
2001-01-19 10:50:31 +00:00
75067b134f
adjust intendation
2001-01-19 10:14:31 +00:00
07eff1f96d
use MERGE_FNUM instead of magic value 16
2001-01-19 10:13:21 +00:00
553f0c9d4c
put MERGE_FNUM here, slighly clean up other defines
2001-01-19 10:12:35 +00:00
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
78487dad59
make DEFLLEN plain 1 << 16, don't substract magic value
2001-01-18 21:03:46 +00:00
966f1aeec3
makeline(): make the overflow handling code safe vs. buffer realloc, add
...
a comment explaining what we do here
2001-01-18 21:02:47 +00:00
c690f5dcc8
cosmetic style change
2001-01-18 20:59:43 +00:00
f9db1fd410
Add trace.o
2001-01-18 05:53:05 +00:00
1d9514fbe4
- fix alignment problem.
2001-01-16 12:06:19 +00:00
d1fef423d6
set date to when this utility became default system sort(1) on NetBSD
...
add information about when it came to NetBSD to HISTORY
2001-01-16 10:36:57 +00:00
d594ce939b
comment or delete text after CPP directives.
2001-01-16 02:50:27 +00:00
fb3e326ed2
Pass CPP and CPPFLAGS to makerrnos.sh, and use them. Default to cpp and
...
empty, respectively, if not provided.
2001-01-16 02:46:25 +00:00
fdfcf1962d
labels (even default:) _must_ be followed by statements! usr.bin/fgen/fgen.l
2001-01-16 02:43:37 +00:00
9cfe468c74
avoid C sequence point issues warned about by development version of gcc.
2001-01-16 02:41:17 +00:00
3e8fb298b1
Avoid accidental use of trigraphs. Pointed out by development version of gcc.
2001-01-16 02:37:03 +00:00
a5854c63b6
.PHONY gnode's don't get a PREFIX, so don't try to set the parent's prefixes
...
on a parallel make.
2001-01-15 22:17:09 +00:00
139c9e6bf2
Once again, do the warning in a format that doesn't completely blow, and that
...
corresponds with text in the man page. Also split it into 2 pieces that can
both be used with, e.g., C-x` in Emacs.
2001-01-14 20:54:16 +00:00
a73d3d97ca
Provide a new .if commands(<target>) primitive that returns true if the
...
target has commands associated with it.
2001-01-14 20:44:26 +00:00
3fbe1ebe81
convert error messages into english
2001-01-14 06:02:25 +00:00
07c4e36361
We cannot override commands yet, ignore the additional sets for now.
...
This will be reverted when the tree is fixed.
2001-01-14 05:41:08 +00:00
50a2a73342
- make the second list of commands override the first like gmake does
...
- remember where the first command definition occured so that we can debug
things.
2001-01-14 05:34:06 +00:00
a2da9e7752
make the -W arg work; it was not put in the getopt string.
2001-01-14 05:33:53 +00:00
a0f7a7d829
crypto/dist/ssh: resolve conflicts with 2.3.0/20010105.
...
usr.bin/ssh: add ssh-keyscan and sftp-server into SUBDIR.
2001-01-14 05:22:31 +00:00
0ec35fe298
Don't dump core when a ``bad address'' error occurs and there is neither
...
a file nor a command underlying it.
This fixes PR #11543 .
2001-01-14 02:22:29 +00:00
f40f1d2ddf
note this sort(1) implementation appeared in 4.4BSD
2001-01-13 21:40:56 +00:00
741c8f626f
back out the change in rev 1.57. it was misguided; see discussion
...
on current-users (subject "build problem - multibyte.c").
2001-01-13 20:36:58 +00:00
ec09544572
And make usage() test for NULL explicitly..
2001-01-13 20:21:56 +00:00
7b5f324dcc
usage() expects a NULL when there is no specific error message.
2001-01-13 20:20:47 +00:00
a3b6f1c251
put back sort, it's fixed now
2001-01-13 20:11:49 +00:00
b36ae8b14a
makeline(): put back the memmove(3) removed in rev 1.5 in belief it's been
...
redundant. "Oops"
This fixes bug reported to me by Simon Burge.
2001-01-13 20:10:52 +00:00
7c5e77a45a
also remove the clpos++ added in rev 1.4
2001-01-13 19:04:21 +00:00
f4074c5bd3
undo broken revision 1.4
2001-01-13 19:01:14 +00:00
8dd4895415
fix few confusing indentation. XXX still broken
2001-01-13 17:27:21 +00:00
41b1ab320a
Disable sort for now, it has a corruption problem.
2001-01-13 14:11:38 +00:00
769f751499
save couple of cycles and bytes by static initialization of sigaction act
...
and sigtable[]
2001-01-13 11:19:41 +00:00
ea53379da3
Switch from GNU to BSD sort. Approved by the Core.
2001-01-13 10:49:06 +00:00
20db24e8e3
add -s/-S to synopsis
...
remove TMPDIR stuff - it no longer applies, at least for now
move the note about link/unlink from BUGS to NOTES
add note about trailing record separator and lack of restriction on
line length or allowed bytes
2001-01-13 10:47:29 +00:00
f2deab8a4c
when merging stuff from several files, make merge handle records correctly
...
for stable sort so that the records are not swapped arbitrarily - this makes
in-tree BSD sort(1) pass regression test 38
while here, do couple of cleanups, like s/16/MERGE_FNUM/ where appropriate,
making local stuff static and some intendation/code format changes
2001-01-13 10:33:30 +00:00
16b90fdb48
one more warning to kill
2001-01-13 10:17:43 +00:00
7102161857
Since SUS explicitly specifies sort(1) should append a record
...
delimiter to file if it doesn't end with one, don't warn when this
happens.
2001-01-13 10:07:06 +00:00
c0f11cbc8f
alltable[], itable[], dtable[] were moved to init.c, g/c from sort.[ch]
...
put extern declaration for gweights[] to sort.h
2001-01-12 19:41:13 +00:00
341955c93c
alltable[], itable[], dtable[] were moved to init.c, g/c from sort.[ch]
...
put extern declaration for gweights[] to sort.h
add -s/-S to usage(), couple of formating nits
2001-01-12 19:41:12 +00:00
7c2fb292db
for stable sort, arrange so that really only relevant part of line
...
is used for sort - this makes sort pass regression test number 36
while here, slighly adjust code formating on couple of places
2001-01-12 19:39:02 +00:00
59c0b59998
comsetic prototype adjustment
2001-01-12 19:31:25 +00:00
adefa598e8
use toupper() where appropriate
...
whitespace/parenthesis police
2001-01-12 19:30:22 +00:00
43de9457c0
remove #if 0 part
2001-01-12 19:24:42 +00:00
pk