aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-11-11 22:43:10 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-11-11 22:43:10 +0000
commit0d8736772d3dda40852c552edfbc649a3494d2fa (patch)
treeee01fb7bf66c8477914bf2b0dc1b8d4d7cd0286d /coreutils
parent272710fe938d122617e35989f071f083d959e13f (diff)
downloadbusybox-0d8736772d3dda40852c552edfbc649a3494d2fa.tar.gz
busybox-0d8736772d3dda40852c552edfbc649a3494d2fa.tar.bz2
head: report file open errors with exitcode 1 (was happily returning 0)
head_main 409 417 +8
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/head.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/head.c b/coreutils/head.c
index 570f140b1..ac476d091 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -40,7 +40,6 @@ int head_main(int argc, char **argv)
int count_bytes = 0;
int header_threshhold = 1;
#endif
-
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 (argc > 1 && argv[1][0] == '-'
+ if (argv[1] && argv[1][0] == '-'
&& 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_FEATURE_FANCY_HEAD
count = xatoul(p);
#else
@@ -128,10 +126,12 @@ int head_main(int argc, char **argv)
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();
+ } else {
+ retval = EXIT_FAILURE;
}
fmt = header_fmt_str;
} while (*++argv);