From: Jim Meyering <jim@meyering.net>
Date: Thu, 1 Nov 2001 21:40:01 +0000 (+0000)
Subject: Include dirfd.h.
X-Git-Tag: FILEUTILS-4_1_1~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fa5979ccb0a1bb10af49c6a2cf12afc76ca3459;p=thirdparty%2Fcoreutils.git

Include dirfd.h.
(print_dir): If dirfd fails, resort to using stat.
---

diff --git a/src/ls.c b/src/ls.c
index 0d57cb51cc..80db94a589 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -108,6 +108,7 @@ int wcwidth ();
 
 #include "argmatch.h"
 #include "dirname.h"
+#include "dirfd.h"
 #include "error.h"
 #include "hard-locale.h"
 #include "hash.h"
@@ -2036,7 +2037,12 @@ print_dir (const char *name, const char *realname)
   if (LOOP_DETECT)
     {
       struct stat dir_stat;
-      if (fstat (dirfd (reading), &dir_stat) < 0)
+      int fd = dirfd (reading);
+
+      /* If dirfd failed, endure the overhead of using stat.  */
+      if ((0 <= fd
+	   ? fstat (fd, &dir_stat)
+	   : stat (name, &dir_stat)) < 0)
 	{
 	  error (0, errno, _("cannot determine device and inode of %s"),
 		 quotearg_colon (name));