summaryrefslogtreecommitdiff
path: root/usr.bin/sort/fsort.h
diff options
context:
space:
mode:
authorEric Jackson <ericj@cvs.openbsd.org>2001-02-04 21:27:02 +0000
committerEric Jackson <ericj@cvs.openbsd.org>2001-02-04 21:27:02 +0000
commit7c9239b092687212692b33fd3bc949bbc97bda80 (patch)
tree7669d1925177125a756ba36106579d657e49f1c8 /usr.bin/sort/fsort.h
parent102fd29b8c10ae3a319396eec50f11e40742869c (diff)
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.
Diffstat (limited to 'usr.bin/sort/fsort.h')
-rw-r--r--usr.bin/sort/fsort.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/sort/fsort.h b/usr.bin/sort/fsort.h
index 6aec0b19685..61b8563962e 100644
--- a/usr.bin/sort/fsort.h
+++ b/usr.bin/sort/fsort.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsort.h,v 1.2 1997/06/30 05:36:17 millert Exp $ */
+/* $OpenBSD: fsort.h,v 1.3 2001/02/04 21:27:01 ericj Exp $ */
/*-
* Copyright (c) 1993
@@ -42,10 +42,12 @@
#define BUFSIZE (1 << POW)
#define MAXNUM (BUFSIZE/10) /* lowish guess at average record size */
#define BUFFEND (EOF-2)
+#define BUFFSMALL (EOF-3) /* buffer is too small to hold line */
#define MAXFCT 1000
#define MAXLLEN ((1 << min(POW-4, 16)) - 14)
-extern u_char **keylist, **l2buf, *buffer, *linebuf;
+extern u_char **keylist, *buffer, *linebuf;
+extern size_t bufsize, linebuf_size;
/* temp files in the stack have a file descriptor, a largest bin (maxb)
* which becomes the last non-empty bin (lastb) when the actual largest