summaryrefslogtreecommitdiff
path: root/usr.bin/sort/fsort.h
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2007-03-07 18:11:04 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2007-03-07 18:11:04 +0000
commita79c2c43999d2c5c5ca6f84d3f0a4f036d0e21b4 (patch)
tree983cc9fb59f184b8790f8b1ce709aaf1b2f5fc2a /usr.bin/sort/fsort.h
parent577a9f29e7e7f9565e573a6e48ac3061cd90b62f (diff)
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@
Diffstat (limited to 'usr.bin/sort/fsort.h')
-rw-r--r--usr.bin/sort/fsort.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/sort/fsort.h b/usr.bin/sort/fsort.h
index a2691563780..ddcb68a037d 100644
--- a/usr.bin/sort/fsort.h
+++ b/usr.bin/sort/fsort.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsort.h,v 1.7 2006/10/29 18:40:34 millert Exp $ */
+/* $OpenBSD: fsort.h,v 1.8 2007/03/07 18:11:03 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -42,8 +42,8 @@
#define MAXFCT 1000
#define MAXLLEN ((1 << min(POW-4, 16)) - 14)
-extern u_char *buffer, *bufend, *linebuf;
-extern size_t bufsize, linebuf_size;
+extern u_char *linebuf;
+extern size_t 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