diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-10-24 05:00:29 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-10-24 05:00:29 +0000 |
commit | 1e2799601614452a40df7862e6ca180ecb08c04d (patch) | |
tree | 153a573095afac8d8d0ea857759ecabd77fb28b7 /coreutils/tail.c | |
parent | 47f91d1f7fc06cf27e2a6c3c2ada99226ba50cb9 (diff) | |
download | busybox-w32-1e2799601614452a40df7862e6ca180ecb08c04d.tar.gz busybox-w32-1e2799601614452a40df7862e6ca180ecb08c04d.tar.bz2 busybox-w32-1e2799601614452a40df7862e6ca180ecb08c04d.zip |
Major rework of the directory structure and the entire build system.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@3561 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/tail.c')
-rw-r--r-- | coreutils/tail.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/tail.c b/coreutils/tail.c index 5e5fbc14f..0c8dec26a 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c | |||
@@ -73,7 +73,7 @@ int tail_main(int argc, char **argv) | |||
73 | case 'f': | 73 | case 'f': |
74 | follow = 1; | 74 | follow = 1; |
75 | break; | 75 | break; |
76 | #ifdef BB_FEATURE_FANCY_TAIL | 76 | #ifdef CONFIG_FEATURE_FANCY_TAIL |
77 | case 'c': | 77 | case 'c': |
78 | units = BYTES; | 78 | units = BYTES; |
79 | /* FALLS THROUGH */ | 79 | /* FALLS THROUGH */ |
@@ -85,7 +85,7 @@ int tail_main(int argc, char **argv) | |||
85 | if (optarg[0] == '+') | 85 | if (optarg[0] == '+') |
86 | from_top = 1; | 86 | from_top = 1; |
87 | break; | 87 | break; |
88 | #ifdef BB_FEATURE_FANCY_TAIL | 88 | #ifdef CONFIG_FEATURE_FANCY_TAIL |
89 | case 'q': | 89 | case 'q': |
90 | hide_headers = 1; | 90 | hide_headers = 1; |
91 | break; | 91 | break; |
@@ -118,7 +118,7 @@ int tail_main(int argc, char **argv) | |||
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | #ifdef BB_FEATURE_FANCY_TAIL | 121 | #ifdef CONFIG_FEATURE_FANCY_TAIL |
122 | /* tail the files */ | 122 | /* tail the files */ |
123 | if (!from_top && units == BYTES) | 123 | if (!from_top && units == BYTES) |
124 | tailbuf = xmalloc(count); | 124 | tailbuf = xmalloc(count); |
@@ -136,7 +136,7 @@ int tail_main(int argc, char **argv) | |||
136 | printf("%s==> %s <==\n", i == 0 ? "" : "\n", argv[optind + i]); | 136 | printf("%s==> %s <==\n", i == 0 ? "" : "\n", argv[optind + i]); |
137 | while ((nread = safe_read(fds[i], buf, sizeof(buf))) > 0) { | 137 | while ((nread = safe_read(fds[i], buf, sizeof(buf))) > 0) { |
138 | if (from_top) { | 138 | if (from_top) { |
139 | #ifdef BB_FEATURE_FANCY_TAIL | 139 | #ifdef CONFIG_FEATURE_FANCY_TAIL |
140 | if (units == BYTES) { | 140 | if (units == BYTES) { |
141 | if (count - 1 <= seen) | 141 | if (count - 1 <= seen) |
142 | nwrite = nread; | 142 | nwrite = nread; |
@@ -169,7 +169,7 @@ int tail_main(int argc, char **argv) | |||
169 | break; | 169 | break; |
170 | } | 170 | } |
171 | } else { | 171 | } else { |
172 | #ifdef BB_FEATURE_FANCY_TAIL | 172 | #ifdef CONFIG_FEATURE_FANCY_TAIL |
173 | if (units == BYTES) { | 173 | if (units == BYTES) { |
174 | if (nread < count) { | 174 | if (nread < count) { |
175 | memmove(tailbuf, tailbuf + nread, count - nread); | 175 | memmove(tailbuf, tailbuf + nread, count - nread); |
@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv) | |||
203 | status = EXIT_FAILURE; | 203 | status = EXIT_FAILURE; |
204 | } | 204 | } |
205 | 205 | ||
206 | #ifdef BB_FEATURE_FANCY_TAIL | 206 | #ifdef CONFIG_FEATURE_FANCY_TAIL |
207 | if (!from_top && units == BYTES) { | 207 | if (!from_top && units == BYTES) { |
208 | if (count < seen) | 208 | if (count < seen) |
209 | seen = count; | 209 | seen = count; |