projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hush: move testsuite files from hush-bugs to hush-parsing
[oweals/busybox.git]
/
coreutils
/
sum.c
diff --git
a/coreutils/sum.c
b/coreutils/sum.c
index df5804899ccce6682d4f75e0364cee7dbb140550..9327ca55e3c9b40975e6f308bd8a357753c53f07 100644
(file)
--- a/
coreutils/sum.c
+++ b/
coreutils/sum.c
@@
-15,22
+15,21
@@
#include "busybox.h"
#include "busybox.h"
-enum {
sysv_sum, bsd_sum
};
+enum {
SUM_BSD, PRINT_NAME, SUM_SYSV
};
/* BSD: calculate and print the rotated checksum and the size in 1K blocks
The checksum varies depending on sizeof (int). */
/* SYSV: calculate and print the checksum and the size in 512-byte blocks */
/* Return 1 if successful. */
/* BSD: calculate and print the rotated checksum and the size in 1K blocks
The checksum varies depending on sizeof (int). */
/* SYSV: calculate and print the checksum and the size in 512-byte blocks */
/* Return 1 if successful. */
-static
int sum_file(const char *file, int type, int print_nam
e)
+static
unsigned sum_file(const char *file, const unsigned typ
e)
{
#define buf bb_common_bufsiz1
{
#define buf bb_common_bufsiz1
- int r, fd;
uintmax_t total_bytes = 0;
uintmax_t total_bytes = 0;
+ int fd = 0, r;
/* The sum of all the input bytes, modulo (UINT_MAX + 1). */
unsigned s = 0;
/* The sum of all the input bytes, modulo (UINT_MAX + 1). */
unsigned s = 0;
- fd = 0;
if (NOT_LONE_DASH(file)) {
fd = open(file, O_RDONLY);
if (fd == -1)
if (NOT_LONE_DASH(file)) {
fd = open(file, O_RDONLY);
if (fd == -1)
@@
-51,7
+50,7
@@
static int sum_file(const char *file, int type, int print_name)
}
total_bytes += bytes_read;
}
total_bytes += bytes_read;
- if (type
== sysv_sum
) {
+ if (type
>= SUM_SYSV
) {
do s += buf[--bytes_read]; while (bytes_read);
} else {
r = 0;
do s += buf[--bytes_read]; while (bytes_read);
} else {
r = 0;
@@
-63,8
+62,9
@@
static int sum_file(const char *file, int type, int print_name)
}
}
}
}
- if (!print_name) file = "";
- if (type == sysv_sum) {
+ if (type < PRINT_NAME)
+ file = "";
+ 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);
r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
s = (r & 0xffff) + (r >> 16);
printf("%d %ju %s\n", s, (total_bytes+511)/512, file);
@@
-74,21
+74,27
@@
static int sum_file(const char *file, int type, int print_name)
#undef buf
}
#undef buf
}
+int sum_main(int argc, char **argv);
int sum_main(int argc, char **argv)
{
int sum_main(int argc, char **argv)
{
-
int
n;
-
int type = bsd_sum
;
+
unsigned
n;
+
unsigned type = SUM_BSD
;
n = getopt32(argc, argv, "sr");
n = getopt32(argc, argv, "sr");
- if (n & 1) type =
sysv_sum
;
+ if (n & 1) type =
SUM_SYSV
;
/* give the bsd priority over sysv func */
/* give the bsd priority over sysv func */
- if (n & 2) type =
bsd_sum
;
+ if (n & 2) type =
SUM_BSD
;
- if (argc == optind)
- n = sum_file("-", type, 0);
- else
+ if (argc == optind) {
+ /* Do not print the name */
+ n = sum_file("-", type);
+ } else {
+ /* Need to print the name if either
+ - more than one file given
+ - doing sysv */
+ type += argc - 1 > optind || type == SUM_SYSV;
for (n = 1; optind < argc; optind++)
for (n = 1; optind < argc; optind++)
- n &= sum_file(argv[optind], type
, 1
);
-
+ n &= sum_file(argv[optind], type);
+ }
return !n;
}
return !n;
}