From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Apr 2005 20:07:22 +0000 (+0000)
Subject: (dc_parse_file): Don't assume fopen does not return stdin.
X-Git-Tag: CPPI-1_12~1033
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc4407f0fe07e25dab4aeef1a972401a15de047e;p=thirdparty%2Fcoreutils.git

(dc_parse_file): Don't assume fopen does not return stdin.
---

diff --git a/src/dircolors.c b/src/dircolors.c
index 5f9df114d7..1253980d0f 100644
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -376,8 +376,9 @@ dc_parse_file (const char *filename)
 {
   FILE *fp;
   bool ok;
+  bool is_stdin = STREQ (filename, "-");
 
-  if (STREQ (filename, "-"))
+  if (is_stdin)
     {
       have_read_stdin = true;
       fp = stdin;
@@ -398,7 +399,7 @@ dc_parse_file (const char *filename)
 
   ok = dc_parse_stream (fp, filename);
 
-  if (fp != stdin && fclose (fp) == EOF)
+  if (!is_stdin && fclose (fp) != 0)
     {
       error (0, errno, "%s", quote (filename));
       return false;