projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftpd: do not use nasty tricks for re-execing if we are on MMU machine.
[oweals/busybox.git]
/
coreutils
/
wc.c
diff --git
a/coreutils/wc.c
b/coreutils/wc.c
index 926b3ac19eaf1b2937420a2572197687bdf76a7f..d0e5482ca500ca141f2abebd5db5ce6c06f46ada 100644
(file)
--- a/
coreutils/wc.c
+++ b/
coreutils/wc.c
@@
-36,14
+36,14
@@
* (adapted from example in gnu wc.c)
*
* echo hello > /tmp/testfile &&
* (adapted from example in gnu wc.c)
*
* echo hello > /tmp/testfile &&
- * (dd ibs=1k skip=1 count=0 &> /dev/null
; wc -c) < /tmp/testfile
+ * (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
*
* for which 'wc -c' should output '0'.
*/
*
* for which 'wc -c' should output '0'.
*/
-#include "
busybox
.h"
+#include "
libbb
.h"
-#if
def CONFIG
_LOCALE_SUPPORT
+#if
ENABLE
_LOCALE_SUPPORT
#define isspace_given_isprint(c) isspace(c)
#else
#undef isspace
#define isspace_given_isprint(c) isspace(c)
#else
#undef isspace
@@
-68,12
+68,12
@@
enum {
WC_LENGTH = 3
};
WC_LENGTH = 3
};
-int wc_main(int argc, char **argv);
-int wc_main(int argc, char **argv)
+int wc_main(int argc, char **argv)
MAIN_EXTERNALLY_VISIBLE
;
+int wc_main(int argc
UNUSED_PARAM
, char **argv)
{
FILE *fp;
const char *s, *arg;
{
FILE *fp;
const char *s, *arg;
- const char *start_fmt = "
%9"COUNT_FMT
;
+ const char *start_fmt = "
%9"COUNT_FMT + 1
;
const char *fname_fmt = " %s\n";
COUNT_T *pcounts;
COUNT_T counts[4];
const char *fname_fmt = " %s\n";
COUNT_T *pcounts;
COUNT_T counts[4];
@@
-86,7
+86,7
@@
int wc_main(int argc, char **argv)
smallint in_word;
unsigned print_type;
smallint in_word;
unsigned print_type;
- print_type = getopt32(arg
c, arg
v, "lwcL");
+ print_type = getopt32(argv, "lwcL");
if (print_type == 0) {
print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
if (print_type == 0) {
print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
@@
-150,7
+150,7
@@
int wc_main(int argc, char **argv)
}
} else if (c == EOF) {
if (ferror(fp)) {
}
} else if (c == EOF) {
if (ferror(fp)) {
- bb_
perror_msg("%s",
arg);
+ bb_
simple_perror_msg(
arg);
status = EXIT_FAILURE;
}
--counts[WC_CHARS];
status = EXIT_FAILURE;
}
--counts[WC_CHARS];