aboutsummaryrefslogtreecommitdiff
path: root/coreutils/tail.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-01-30 01:30:39 +0000
committerRob Landley <rob@landley.net>2006-01-30 01:30:39 +0000
commitf8fd4db92f5626ef0065f5838fad42ad0fd0b362 (patch)
tree7a894633a6e3e0fd48f32f6fc1eb9596b01477ee /coreutils/tail.c
parentdd53c24d412c304e19ba64c7a9cb26dd1068bcd0 (diff)
downloadbusybox-w32-f8fd4db92f5626ef0065f5838fad42ad0fd0b362.tar.gz
busybox-w32-f8fd4db92f5626ef0065f5838fad42ad0fd0b362.tar.bz2
busybox-w32-f8fd4db92f5626ef0065f5838fad42ad0fd0b362.zip
Move SUSv2 obsolete feature disabling to debug menu, invert meaning of
symbol (switched on to remove now: test your apps to make sure they _don't_ do this, because as some point we should just yank it), fixup head/tail/fold. Also tweak "make allyesconfig" so anything starting with CONFIG_DEBUG gets left switched off. Possibly other things we want to put in the debug menu?
Diffstat (limited to 'coreutils/tail.c')
-rw-r--r--coreutils/tail.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 49c00f3c9..48abc4b84 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -4,20 +4,7 @@
4 * 4 *
5 * Copyright (C) 2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu> 5 * Copyright (C) 2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
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 *
21 */ 8 */
22 9
23/* BB_AUDIT SUSv3 compliant (need fancy for -c) */ 10/* BB_AUDIT SUSv3 compliant (need fancy for -c) */
@@ -53,11 +40,7 @@ static const struct suffix_mult tail_suffixes[] = {
53 { NULL, 0 } 40 { NULL, 0 }
54}; 41};
55 42
56static int status 43static int status;
57#if EXIT_SUCCESS != 0
58 = EXIT_SUCCESS /* If it is 0 (paranoid check), let bss initialize it. */
59#endif
60 ;
61 44
62static void tail_xprint_header(const char *fmt, const char *filename) 45static void tail_xprint_header(const char *fmt, const char *filename)
63{ 46{
@@ -121,7 +104,7 @@ int tail_main(int argc, char **argv)
121 char *s, *buf; 104 char *s, *buf;
122 const char *fmt; 105 const char *fmt;
123 106
124#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL 107#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
125 /* Allow legacy syntax of an initial numeric option without -n. */ 108 /* Allow legacy syntax of an initial numeric option without -n. */
126 if (argc >=2 && ((argv[1][0] == '+') || ((argv[1][0] == '-') 109 if (argc >=2 && ((argv[1][0] == '+') || ((argv[1][0] == '-')
127 /* && (isdigit)(argv[1][1]) */ 110 /* && (isdigit)(argv[1][1]) */
@@ -142,7 +125,7 @@ int tail_main(int argc, char **argv)
142 count_bytes = 1; 125 count_bytes = 1;
143 /* FALLS THROUGH */ 126 /* FALLS THROUGH */
144 case 'n': 127 case 'n':
145#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL 128#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
146 GET_COUNT: 129 GET_COUNT:
147#endif 130#endif
148 count = bb_xgetlarg10_sfx(optarg, tail_suffixes); 131 count = bb_xgetlarg10_sfx(optarg, tail_suffixes);