mountpoint: fix a minor bug with 0:0 devno

zhi@debian-lizhi:~$ mountpoint /sys
/sys is not a mountpoint
zhi@debian-lizhi:~$

The problem is in mountpoint.c, function dir_to_device(), which uses 0 as an
error return value, but for sysfs 0 is its device number:

zhi@debian-lizhi:~$ cat /proc/self/mountinfo
14 19 0:0 / /sys rw,nosuid,nodev,noexec,relatime - sysfs none rw
15 19 0:3 / /proc rw,nosuid,nodev,noexec,relatime - proc none rw

My change is on dir_to_device, seperating device number from return value.

Signed-off-by: Zhi Li <lizhi1215@gmail.com>

diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index b3f150c16138253ab35ddbbb1391c3f7a4634346..bd92667590be823a7176f528234a7768a1314f14 100644 (file)
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -40,12 +40,11 @@
 
 static int quiet;
 
-static dev_t dir_to_device(const char *spec)
+static int dir_to_device(const char *spec, dev_t *dev)
 {
        struct libmnt_table *tb = mnt_new_table_from_file("/proc/self/mountinfo");
        struct libmnt_fs *fs;
        struct libmnt_cache *cache;
-       dev_t res = 0;
 
        if (!tb) {
                /*
@@ -57,7 +56,7 @@ static dev_t dir_to_device(const char *spec)
                int len;
 
                if (stat(spec, &st) != 0)
-                       return 0;
+                       return -1;
 
                cn = mnt_resolve_path(spec, NULL);      /* canonicalize */
 
@@ -65,15 +64,17 @@ static dev_t dir_to_device(const char *spec)
                free(cn);
 
                if (len < 0 || (size_t) len + 1 > sizeof(buf))
-                       return 0;
+                       return -1;
                if (stat(buf, &pst) !=0)
-                       return 0;
+                       return -1;
 
                if ((st.st_dev != pst.st_dev) ||
-                   (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino))
-                       return st.st_dev;
+                   (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino)) {
+                       *dev = st.st_dev;
+                       return 0;
+               }
 
-               return 0;
+               return -1;
        }
 
        /* to canonicalize all necessary paths */
@@ -82,11 +83,11 @@ static dev_t dir_to_device(const char *spec)
 
        fs = mnt_table_find_target(tb, spec, MNT_ITER_BACKWARD);
        if (fs && mnt_fs_get_target(fs))
-               res = mnt_fs_get_devno(fs);
+               *dev = mnt_fs_get_devno(fs);
 
        mnt_free_table(tb);
        mnt_free_cache(cache);
-       return res;
+       return 0;
 }
 
 static int print_devno(const char *devname, struct stat *st)
@@ -185,8 +186,8 @@ int main(int argc, char **argv)
                                errx(EXIT_FAILURE, _("%s: not a directory"), spec);
                        return EXIT_FAILURE;
                }
-               src = dir_to_device(spec);
-               if (!src) {
+
+               if ( dir_to_device(spec, &src)) {
                        if (!quiet)
                                printf(_("%s is not a mountpoint\n"), spec);
                        return EXIT_FAILURE;