aboutsummaryrefslogtreecommitdiff
path: root/coreutils/wc.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-01-04 19:56:15 +0700
committerNguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-01-04 19:56:15 +0700
commit5f6f2162512106adf120d4b528bb125e93e34429 (patch)
tree7d7449f755633c263be7125ad58d21cc3ca5b8a7 /coreutils/wc.c
parent9db69882bee2d528d706d61d34ef7741122330be (diff)
parenta116552869db5e7793ae10968eb3c962c69b3d8c (diff)
downloadbusybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz
busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2
busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'coreutils/wc.c')
-rw-r--r--coreutils/wc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/wc.c b/coreutils/wc.c
index ecadae59b..fe3f274f8 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -153,7 +153,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
153 bb_simple_perror_msg(arg); 153 bb_simple_perror_msg(arg);
154 status = EXIT_FAILURE; 154 status = EXIT_FAILURE;
155 } 155 }
156 goto DO_EOF; /* Treat an EOF as '\r'. */ 156 goto DO_EOF; /* Treat an EOF as '\r'. */
157 } 157 }
158 158
159 /* Cater for -c and -m */ 159 /* Cater for -c and -m */
@@ -179,7 +179,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
179 */ 179 */
180 if (c == '\t') { 180 if (c == '\t') {
181 linepos = (linepos | 7) + 1; 181 linepos = (linepos | 7) + 1;
182 } else { /* '\n', '\r', '\f', or '\v' */ 182 } else { /* '\n', '\r', '\f', or '\v' */
183 DO_EOF: 183 DO_EOF:
184 if (linepos > counts[WC_LENGTH]) { 184 if (linepos > counts[WC_LENGTH]) {
185 counts[WC_LENGTH] = linepos; 185 counts[WC_LENGTH] = linepos;
@@ -230,7 +230,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
230 * effect of trashing the totals array after outputting it, but that's 230 * effect of trashing the totals array after outputting it, but that's
231 * irrelavent since we no longer need it. */ 231 * irrelavent since we no longer need it. */
232 if (num_files > 1) { 232 if (num_files > 1) {
233 num_files = 0; /* Make sure we don't get here again. */ 233 num_files = 0; /* Make sure we don't get here again. */
234 arg = "total"; 234 arg = "total";
235 pcounts = totals; 235 pcounts = totals;
236 --argv; 236 --argv;