diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2006-10-28 21:14:30 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2006-10-28 21:14:30 +0000 |
| commit | 0f9bae4aff082f19e21ef9f53f414a8fddc7796f (patch) | |
| tree | 1902024353ed580eba791df90176cc54423f77eb /usr.bin/sort/sort.c | |
| parent | 15046173c609145fe01171cd421fc7a14f588a62 (diff) | |
revert previous change; causes segfault when called from
pkg_mklocatedb/locate.mklocatedb
Diffstat (limited to 'usr.bin/sort/sort.c')
| -rw-r--r-- | usr.bin/sort/sort.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 430f3854d2e..f5da9ad174e 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sort.c,v 1.29 2006/10/18 23:30:43 millert Exp $ */ +/* $OpenBSD: sort.c,v 1.30 2006/10/28 21:14:29 naddy Exp $ */ /*- * Copyright (c) 1993 @@ -42,7 +42,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sort.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: sort.c,v 1.29 2006/10/18 23:30:43 millert Exp $"; +static char rcsid[] = "$OpenBSD: sort.c,v 1.30 2006/10/28 21:14:29 naddy Exp $"; #endif #endif /* not lint */ @@ -254,13 +254,6 @@ main(int argc, char *argv[]) else get = makekey; - if ((buffer = malloc(bufsize)) == NULL) - err(2, NULL); - if (!SINGL_FLD) { - if ((linebuf = malloc(linebuf_size)) == NULL) - err(2, NULL); - } - if (cflag) { order(filelist, get, fldtab); /* NOT REACHED */ |