From: Paul Eggert Date: Mon, 11 Apr 2005 20:07:37 +0000 (+0000) Subject: (head_file): Don't assume open does not return 0. X-Git-Tag: CPPI-1_12~1032 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea778b6463b576bb12c851c8ee84b263a3bb64f9;p=thirdparty%2Fcoreutils.git (head_file): Don't assume open does not return 0. --- diff --git a/src/head.c b/src/head.c index b641f84a2c..5c835b4365 100644 --- a/src/head.c +++ b/src/head.c @@ -851,8 +851,9 @@ head_file (const char *filename, uintmax_t n_units, bool count_lines, { int fd; bool ok; + bool is_stdin = STREQ (filename, "-"); - if (STREQ (filename, "-")) + if (is_stdin) { have_read_stdin = true; fd = STDIN_FILENO; @@ -869,7 +870,7 @@ head_file (const char *filename, uintmax_t n_units, bool count_lines, } ok = head (filename, fd, n_units, count_lines, elide_from_end); - if (fd != STDIN_FILENO && close (fd) == -1) + if (!is_stdin && close (fd) != 0) { error (0, errno, _("closing %s"), quote (filename)); return false;