projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ls: add support for -H
[oweals/busybox.git]
/
coreutils
/
head.c
diff --git
a/coreutils/head.c
b/coreutils/head.c
index 570f140b1d99f9775dd5e9fbb13d8850277c7783..669aae8193eb276dfd7e7eead3ae9049948b9926 100644
(file)
--- a/
coreutils/head.c
+++ b/
coreutils/head.c
@@
-4,7
+4,7
@@
*
* Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
*
*
* Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
*
- * Licensed under GPLv2 or later, see file LICENSE in this
tarball for details
.
+ * Licensed under GPLv2 or later, see file LICENSE in this
source tree
.
*/
/* BB_AUDIT SUSv3 compliant */
*/
/* BB_AUDIT SUSv3 compliant */
@@
-13,6
+13,8
@@
#include "libbb.h"
#include "libbb.h"
+/* This is a NOEXEC applet. Be very careful! */
+
static const char head_opts[] ALIGN1 =
"n:"
#if ENABLE_FEATURE_FANCY_HEAD
static const char head_opts[] ALIGN1 =
"n:"
#if ENABLE_FEATURE_FANCY_HEAD
@@
-20,16
+22,14
@@
static const char head_opts[] ALIGN1 =
#endif
;
#endif
;
-#if ENABLE_FEATURE_FANCY_HEAD
static const struct suffix_mult head_suffixes[] = {
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
static const struct suffix_mult head_suffixes[] = {
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
- { }
+ {
"", 0
}
};
};
-#endif
-static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n";
+#define header_fmt_str "\n==> %s <==\n"
int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int head_main(int argc, char **argv)
int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int head_main(int argc, char **argv)
@@
-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,12
+78,7
@@
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
count = xatoul_sfx(p, head_suffixes);
count = xatoul_sfx(p, head_suffixes);
-#endif
break;
default:
bb_show_usage();
break;
default:
bb_show_usage();
@@
-128,10
+122,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_simple_perror_msg(*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);