diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-26 23:21:47 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-26 23:21:47 +0000 |
commit | 6dc3a21627db11fa0f374afe29a6bbf4f89c8b64 (patch) | |
tree | 79166b700c497fbe798b6031e5bbff97e0933573 /coreutils/head.c | |
parent | 076d919b597733c0adf653d0ad10073be4adec7f (diff) | |
download | busybox-w32-6dc3a21627db11fa0f374afe29a6bbf4f89c8b64.tar.gz busybox-w32-6dc3a21627db11fa0f374afe29a6bbf4f89c8b64.tar.bz2 busybox-w32-6dc3a21627db11fa0f374afe29a6bbf4f89c8b64.zip |
remove bb_printf and the like
git-svn-id: svn://busybox.net/trunk/busybox@16446 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/head.c')
-rw-r--r-- | coreutils/head.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/coreutils/head.c b/coreutils/head.c index 060febcf7..2e9000df4 100644 --- a/coreutils/head.c +++ b/coreutils/head.c | |||
@@ -112,12 +112,13 @@ int head_main(int argc, char **argv) | |||
112 | #endif | 112 | #endif |
113 | 113 | ||
114 | do { | 114 | do { |
115 | if ((fp = bb_wfopen_input(*argv)) != NULL) { | 115 | fp = bb_wfopen_input(*argv); |
116 | if (fp) { | ||
116 | if (fp == stdin) { | 117 | if (fp == stdin) { |
117 | *argv = (char *) bb_msg_standard_input; | 118 | *argv = (char *) bb_msg_standard_input; |
118 | } | 119 | } |
119 | if (header_threshhold) { | 120 | if (header_threshhold) { |
120 | bb_printf(fmt, *argv); | 121 | printf(fmt, *argv); |
121 | } | 122 | } |
122 | i = count; | 123 | i = count; |
123 | while (i && ((c = getc(fp)) != EOF)) { | 124 | while (i && ((c = getc(fp)) != EOF)) { |
@@ -130,10 +131,10 @@ int head_main(int argc, char **argv) | |||
130 | bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */ | 131 | bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */ |
131 | retval = EXIT_FAILURE; | 132 | retval = EXIT_FAILURE; |
132 | } | 133 | } |
133 | xferror_stdout(); | 134 | die_if_ferror_stdout(); |
134 | } | 135 | } |
135 | fmt = header_fmt_str; | 136 | fmt = header_fmt_str; |
136 | } while (*++argv); | 137 | } while (*++argv); |
137 | 138 | ||
138 | bb_fflush_stdout_and_exit(retval); | 139 | fflush_stdout_and_exit(retval); |
139 | } | 140 | } |