aboutsummaryrefslogtreecommitdiff
path: root/coreutils/sort.c
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-02-24 02:30:39 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-02-24 02:30:39 +0000
commitc1feeaa65eb4a3bef31f506fd4f0a769826ec9a4 (patch)
tree432c38fd4819faa22fb61c5f5a7114774a97493b /coreutils/sort.c
parent506fdc445f10e21d4405ad20243e0743c22bfbd0 (diff)
downloadbusybox-w32-c1feeaa65eb4a3bef31f506fd4f0a769826ec9a4.tar.gz
busybox-w32-c1feeaa65eb4a3bef31f506fd4f0a769826ec9a4.tar.bz2
busybox-w32-c1feeaa65eb4a3bef31f506fd4f0a769826ec9a4.zip
A few changes falling out from the effort to make sed handle embedded NUL bytes.
Checking in to reduce the diff between my tree and svn... git-svn-id: svn://busybox.net/trunk/busybox@14254 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/sort.c')
-rw-r--r--coreutils/sort.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c
index b56a5abb8..98cea7cd7 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -4,19 +4,9 @@
4 * 4 *
5 * Copyright (C) 2004 by Rob Landley <rob@landley.net> 5 * Copyright (C) 2004 by Rob Landley <rob@landley.net>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * MAINTAINER: Rob Landley <rob@landley.net>
8 * it under the terms of the GNU General Public License as published by 8 *
9 * the Free Software Foundation; either version 2 of the License, or 9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 * 10 *
21 * See SuS3 sort standard at: 11 * See SuS3 sort standard at:
22 * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html 12 * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
@@ -142,7 +132,7 @@ static struct sort_key *add_key(void)
142 return *pkey=xcalloc(1,sizeof(struct sort_key)); 132 return *pkey=xcalloc(1,sizeof(struct sort_key));
143} 133}
144 134
145#define GET_LINE(fp) (global_flags&FLAG_z) ? bb_get_chunk_from_file(fp) \ 135#define GET_LINE(fp) (global_flags&FLAG_z) ? bb_get_chunk_from_file(fp,NULL) \
146 : bb_get_chomped_line_from_file(fp) 136 : bb_get_chomped_line_from_file(fp)
147#else 137#else
148#define GET_LINE(fp) bb_get_chomped_line_from_file(fp) 138#define GET_LINE(fp) bb_get_chomped_line_from_file(fp)