File coreutils-one-file-system_ignores_non-directory... of Package coreutils

Overview Repositories Revisions Requests Users Attributes Meta

File coreutils-one-file-system_ignores_non-directory_arguments.patch of Package coreutils (Revision a1e703b92a038dc4fabfa898cd34b9f9)

Currently displaying revision a1e703b92a038dc4fabfa898cd34b9f9 , Show latest

From b51e77776fbc4c8fa6727388b735427596595477 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Thu, 8 Mar 2012 10:33:50 +0100
Subject: [PATCH] du: --one-file-system (-x) ignores non-directory arguments

Surprise!  "du -x non-DIR" would print nothing.
Note that the problem arises only when processing a non-directory
specified on the command line.  Not surprisingly, "du -x" still
works as expected for any directory argument.

When performing its same-file-system check, du may skip an entry
only if it is at fts_level 1 or greater.  Command-line arguments
are at fts_level == 0 (FTS_ROOTLEVEL).

* src/du.c (process_file): Don't use the top-level FTS->fts_dev
when testing for --one-file-system (-x).  It happens to be valid
for directories, but it is always 0 for a non-directory.
* tests/du/one-file-system: Add tests for this.
* NEWS (Bug fixes): Mention it.
Reported by Daniel Stavrovski in http://bugs.gnu.org/10967.
Introduced by commit v8.14-95-gcfe1040.
---
 NEWS                     |    4 ++++
 THANKS.in                |    1 +
 src/du.c                 |    9 ++++++++-
 tests/du/one-file-system |   10 +++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

Signed-off-by: Philipp Thomas <pth@suse.de>

Index: NEWS
===================================================================
--- NEWS.orig	2012-01-06 18:05:54.000000000 +0100
+++ NEWS	2012-03-09 16:02:59.869039812 +0100
@@ -8,6 +8,10 @@ GNU coreutils NEWS
 
 ** Bug fixes
 
+  du --one-file-system (-x) would ignore any non-directory specified on
+  the command line.  For example, "touch f; du -x f" would print nothing.
+  [bug introduced in coreutils-8.14]
+
   du -x no longer counts root directories of other file systems.
   [bug introduced in coreutils-5.1.0]
 
Index: THANKS.in
===================================================================
--- THANKS.in.orig	2012-01-06 10:14:19.000000000 +0100
+++ THANKS.in	2012-03-09 16:05:13.299787739 +0100
@@ -133,6 +133,7 @@ Dan Hagerty                         hag@
 Dan Pascu                           dan@services.iiruc.ro
 Daniel Bergstrom                    noa@melody.se
 Daniel P. Berrangé                  berrange@redhat.com
+Daniel Stavrovski                   d@stavrovski.net
 Dániel Varga                        danielv@axelero.hu
 Danny Levinson                      danny.levinson@overture.com
 Darrel Francis                      d.francis@cheerful.com
Index: src/du.c
===================================================================
--- src/du.c.orig	2012-01-01 10:04:06.000000000 +0100
+++ src/du.c	2012-03-09 16:02:22.412951567 +0100
@@ -444,7 +444,14 @@ process_file (FTS *fts, FTSENT *ent)
               return false;
             }
 
-          if (fts->fts_options & FTS_XDEV && fts->fts_dev != sb->st_dev)
+          /* The --one-file-system (-x) option cannot exclude anything
+             specified on the command-line.  By definition, it can exclude
+             a file or directory only when its device number is different
+             from that of its just-processed parent directory, and du does
+             not process the parent of a command-line argument.  */
+          if (fts->fts_options & FTS_XDEV
+              && FTS_ROOTLEVEL < ent->fts_level
+              && fts->fts_dev != sb->st_dev)
             excluded = true;
         }
 
Index: tests/du/one-file-system
===================================================================
--- tests/du/one-file-system.orig	2012-01-01 10:04:06.000000000 +0100
+++ tests/du/one-file-system	2012-03-09 16:02:22.412951567 +0100
@@ -43,7 +43,15 @@ compare exp out || fail=1
 du -xL d > u || fail=1
 sed 's/^[0-9][0-9]*	//' u > out1
 echo d > exp1 || fail=1
-
 compare exp1 out1 || fail=1
 
+# With coreutils-8.15, "du -xs FILE" would print no output.
+touch f
+for opt in -x -xs; do
+  du $opt f > u || fail=1
+  sed 's/^[0-9][0-9]*	//' u > out2
+  echo f > exp2 || fail=1
+  compare exp2 out2 || fail=1
+done
+
 Exit $fail

Places

File coreutils-one-file-system_ignores_non-directory_arguments.patch of Package coreutils (Revision a1e703b92a038dc4fabfa898cd34b9f9)

Places