*: shrink by using [f]open_or_warn_stdin where appropriate

function                                             old     new   delta
lsattr_main                                           62     143     +81
open_or_warn_stdin                                     -      36     +36
fclose_if_not_stdin                                   20      47     +27
xfopen_stdin                                           -      20     +20
tac_main                                             336     356     +20
cksum_main                                           249     259     +10
bb_argv_dash                                           -       8      +8
su_main                                              448     455      +7
cmp_main                                             630     633      +3
passwd_main                                         1072    1074      +2
uudecode_main                                        317     315      -2
text_yank                                            110     108      -2
handle_incoming_and_exit                            2653    2651      -2
flags                                                  5       1      -4
write_leases                                         235     230      -5
fopen_or_warn_stdin                                   48      42      -6
fold_main                                            648     642      -6
static.argv_dash                                       8       -      -8
sum_main                                             142     128     -14
tail_main                                           1237    1221     -16
sed_main                                             711     695     -16
cmp_xfopen_input                                      17       -     -17
bb_cat                                               113      96     -17
catv_main                                            328     306     -22
strings_main                                         457     434     -23
hash_file                                            298     274     -24
sum_file                                             353     325     -28
sort_main                                            904     859     -45
expand_main                                          736     686     -50
cut_main                                            1116    1065     -51
md5_sha1_sum_main                                    549     493     -56
lsattr_args                                           90       -     -90
read_stduu                                           408     255    -153
------------------------------------------------------------------------------
(add/remove: 3/3 grow/shrink: 7/20 up/down: 214/-657)        Total: -443 bytes
   text    data     bss     dec     hex filename
 797417     658    7428  805503   c4a7f busybox_old
 796973     658    7428  805059   c48c3 busybox_unstripped

1 files changed, 13 insertions, 14 deletions

diff --git a/coreutils/sum.c b/coreutils/sum.c
index 65478b0a1..e6cfbfd80 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -21,20 +21,17 @@ enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
    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 unsigned sum_file(const char *file, const unsigned type)
+static unsigned sum_file(const char *file, unsigned type)
 {
 #define buf bb_common_bufsiz1
 	unsigned long long total_bytes = 0;
-	int fd = 0, r;
-
+	int fd, r;
 	/* The sum of all the input bytes, modulo (UINT_MAX + 1).  */
 	unsigned s = 0;
 
-	if (NOT_LONE_DASH(file)) {
-		fd = open(file, O_RDONLY);
-		if (fd == -1)
-			goto ret_bad;
-	}
+	fd = open_or_warn_stdin(file);
+	if (fd == -1)
+		return 0;
 
 	while (1) {
 		size_t bytes_read = safe_read(fd, buf, BUFSIZ);
@@ -44,7 +41,6 @@ static unsigned sum_file(const char *file, const unsigned type)
 			if (!bytes_read && !r)
 				/* no error */
 				break;
- ret_bad:
 			bb_perror_msg(file);
 			return 0;
 		}
@@ -75,26 +71,29 @@ static unsigned sum_file(const char *file, const unsigned type)
 }
 
 int sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int sum_main(int argc, char **argv)
+int sum_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
 	unsigned n;
 	unsigned type = SUM_BSD;
 
 	n = getopt32(argv, "sr");
+	argv += optind;
 	if (n & 1) type = SUM_SYSV;
 	/* give the bsd priority over sysv func */
 	if (n & 2) type = SUM_BSD;
 
-	if (argc == optind) {
+	if (!argv[0]) {
 		/* 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++)
-			n &= sum_file(argv[optind], type);
+		type += (argv[1] || type == SUM_SYSV);
+		n = 1;
+		do {
+			n &= sum_file(*argv, type);
+		} while (*++argv);
 	}
 	return !n;
 }