projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cttyhack: add missing ';'
[oweals/busybox.git]
/
coreutils
/
sum.c
diff --git
a/coreutils/sum.c
b/coreutils/sum.c
index 5799d142d63d3ab7d65f8822961eabf14a5b26f3..65478b0a1b4dd619bffdbcc1fd65dd1881fd7971 100644
(file)
--- a/
coreutils/sum.c
+++ b/
coreutils/sum.c
@@
-24,7
+24,7
@@
enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
static unsigned sum_file(const char *file, const unsigned type)
{
#define buf bb_common_bufsiz1
static unsigned sum_file(const char *file, const unsigned type)
{
#define buf bb_common_bufsiz1
- u
intmax_t
total_bytes = 0;
+ u
nsigned long long
total_bytes = 0;
int fd = 0, r;
/* The sum of all the input bytes, modulo (UINT_MAX + 1). */
int fd = 0, r;
/* The sum of all the input bytes, modulo (UINT_MAX + 1). */
@@
-67,20
+67,20
@@
static unsigned sum_file(const char *file, const unsigned type)
if (type >= SUM_SYSV) {
r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
s = (r & 0xffff) + (r >> 16);
if (type >= SUM_SYSV) {
r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
s = (r & 0xffff) + (r >> 16);
- printf("%d %
ju %s\n", s, (total_bytes+511)/
512, file);
+ printf("%d %
llu %s\n", s, (total_bytes + 511) /
512, file);
} else
} else
- printf("%05d %5
ju %s\n", s, (total_bytes+1023)/
1024, file);
+ printf("%05d %5
llu %s\n", s, (total_bytes + 1023) /
1024, file);
return 1;
#undef buf
}
return 1;
#undef buf
}
-int sum_main(int argc, char **argv);
+int sum_main(int argc, char **argv)
MAIN_EXTERNALLY_VISIBLE
;
int sum_main(int argc, char **argv)
{
unsigned n;
unsigned type = SUM_BSD;
int sum_main(int argc, char **argv)
{
unsigned n;
unsigned type = SUM_BSD;
- n = getopt32(arg
c, arg
v, "sr");
+ n = getopt32(argv, "sr");
if (n & 1) type = SUM_SYSV;
/* give the bsd priority over sysv func */
if (n & 2) type = SUM_BSD;
if (n & 1) type = SUM_SYSV;
/* give the bsd priority over sysv func */
if (n & 2) type = SUM_BSD;