From: Jim Meyering <jim@meyering.net>
Date: Fri, 17 Oct 2003 11:12:11 +0000 (+0000)
Subject: Include "xfts.h".
X-Git-Tag: v5.1.0~357
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=433a4c3059046642b0b79f9e6e9f0d8242e0117f;p=thirdparty%2Fcoreutils.git

Include "xfts.h".
(du_files): Use xfts_open, rather than fts_open.
---

diff --git a/src/du.c b/src/du.c
index 4de1a63fe7..d1ae5b7325 100644
--- a/src/du.c
+++ b/src/du.c
@@ -34,12 +34,12 @@
 #include "dirname.h" /* for strip_trailing_slashes */
 #include "error.h"
 #include "exclude.h"
-#include "fts_.h"
 #include "hash.h"
 #include "human.h"
 #include "quote.h"
 #include "quotearg.h"
 #include "same.h"
+#include "xfts.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
@@ -472,27 +472,7 @@ du_files (char **files, int bit_flags)
 {
   int fail = 0;
 
-  FTS *fts = fts_open (files, bit_flags, NULL);
-  if (fts == NULL)
-    {
-      /* This can fail in three ways: out of memory, invalid bit_flags,
-	 and one or more of the FILES is an empty string.  We could try
-	 to decipher that errno==EINVAL means invalid bit_flags and
-	 errno==ENOENT means there's an empty string, but that seems wrong.
-	 Ideally, fts_open would return a proper error indicator.  For now,
-	 we'll presume that the bit_flags are valid and just check for
-	 empty strings.  */
-      bool invalid_arg = false;
-      for (; *files; ++files)
-	{
-	  if (**files == '\0')
-	    invalid_arg = true;
-	}
-      if (invalid_arg)
-	error (EXIT_FAILURE, 0, _("invalid argument: %s"), quote (""));
-      else
-	xalloc_die ();
-    }
+  FTS *fts = xfts_open (files, bit_flags, NULL);
 
   while (1)
     {