From 2091f44993c4d0ad16cbe272c247bb452ae74216 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 4 Dec 2013 00:50:10 +0000
Subject: df: handle bind mounts when processing device nodes

* src/df.c (get_disk): Use the same heuristic used in
get_point() to select the shortest file system mount point,
in an attempt to show the base mounted file system.
* NEWS: Mention the bug fix.
---
 src/df.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/df.c')

diff --git a/src/df.c b/src/df.c
index 8eabcbbaa..969670e82 100644
--- a/src/df.c
+++ b/src/df.c
@@ -1062,10 +1062,21 @@ get_disk (char const *disk)
   if (resolved && resolved[0] == '/')
     disk = resolved;
 
+  size_t best_match_len = SIZE_MAX;
   for (me = mount_list; me; me = me->me_next)
     {
       if (STREQ (disk, me->me_devname))
-        best_match = me;
+        {
+          size_t len = strlen (me->me_mountdir);
+          if (len < best_match_len)
+            {
+              best_match = me;
+              if (len == 1) /* Traditional root.  */
+                break;
+              else
+                best_match_len = len;
+            }
+        }
     }
 
   free (resolved);
-- 
cgit v1.2.3-54-g00ecf