projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libbb: remove glibc-style bloat from sha_crypt. -1130 bytes.
[oweals/busybox.git]
/
coreutils
/
head.c
diff --git
a/coreutils/head.c
b/coreutils/head.c
index 1700af27ab9959eed524adbbc6d0d514063515d9..ac476d09199e93b9967b20202c9b921eb8e353f1 100644
(file)
--- a/
coreutils/head.c
+++ b/
coreutils/head.c
@@
-13,7
+13,7
@@
#include "libbb.h"
#include "libbb.h"
-static const char head_opts[] =
+static const char head_opts[]
ALIGN1
=
"n:"
#if ENABLE_FEATURE_FANCY_HEAD
"c:qv"
"n:"
#if ENABLE_FEATURE_FANCY_HEAD
"c:qv"
@@
-25,13
+25,13
@@
static const struct suffix_mult head_suffixes[] = {
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
- {
NULL, 0
}
+ { }
};
#endif
};
#endif
-static const char header_fmt_str[] = "\n==> %s <==\n";
+static const char header_fmt_str[]
ALIGN1
= "\n==> %s <==\n";
-int head_main(int argc, char **argv);
+int head_main(int argc, char **argv)
MAIN_EXTERNALLY_VISIBLE
;
int head_main(int argc, char **argv)
{
unsigned long count = 10;
int head_main(int argc, char **argv)
{
unsigned long count = 10;
@@
-40,7
+40,6
@@
int head_main(int argc, char **argv)
int count_bytes = 0;
int header_threshhold = 1;
#endif
int count_bytes = 0;
int header_threshhold = 1;
#endif
-
FILE *fp;
const char *fmt;
char *p;
FILE *fp;
const char *fmt;
char *p;
@@
-50,7
+49,7
@@
int head_main(int argc, char **argv)
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
/* Allow legacy syntax of an initial numeric option without -n. */
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
/* Allow legacy syntax of an initial numeric option without -n. */
- if (arg
c > 1
&& argv[1][0] == '-'
+ if (arg
v[1]
&& argv[1][0] == '-'
&& isdigit(argv[1][1])
) {
--argc;
&& isdigit(argv[1][1])
) {
--argc;
@@
-79,7
+78,6
@@
int head_main(int argc, char **argv)
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
GET_COUNT:
#endif
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
GET_COUNT:
#endif
-
#if !ENABLE_FEATURE_FANCY_HEAD
count = xatoul(p);
#else
#if !ENABLE_FEATURE_FANCY_HEAD
count = xatoul(p);
#else
@@
-91,19
+89,19
@@
int head_main(int argc, char **argv)
}
}
}
}
+ argc -= optind;
argv += optind;
argv += optind;
- if (!*argv)
{
+ if (!*argv)
*--argv = (char*)"-";
*--argv = (char*)"-";
- }
fmt = header_fmt_str + 1;
#if ENABLE_FEATURE_FANCY_HEAD
fmt = header_fmt_str + 1;
#if ENABLE_FEATURE_FANCY_HEAD
- if (argc
- optind
<= header_threshhold) {
+ if (argc <= header_threshhold) {
header_threshhold = 0;
}
#else
header_threshhold = 0;
}
#else
- if (argc <=
optind +
1) {
- fmt += 11;
+ if (argc <= 1) {
+ fmt += 11;
/* "" */
}
/* Now define some things here to avoid #ifdefs in the code below.
* These should optimize out of the if conditions below. */
}
/* Now define some things here to avoid #ifdefs in the code below.
* These should optimize out of the if conditions below. */
@@
-128,10
+126,12
@@
int head_main(int argc, char **argv)
putchar(c);
}
if (fclose_if_not_stdin(fp)) {
putchar(c);
}
if (fclose_if_not_stdin(fp)) {
- bb_
perror_msg("%s", *argv); /* Avoid multibyte problems. */
+ bb_
simple_perror_msg(*argv);
retval = EXIT_FAILURE;
}
die_if_ferror_stdout();
retval = EXIT_FAILURE;
}
die_if_ferror_stdout();
+ } else {
+ retval = EXIT_FAILURE;
}
fmt = header_fmt_str;
} while (*++argv);
}
fmt = header_fmt_str;
} while (*++argv);