components/coreutils/patches/mountlist.c.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 17 Apr 2014 10:00:40 -0700
changeset 1833 0edb05d72e6b
parent 987 810b92005f34
child 2050 7c6a1559c620
permissions -rw-r--r--
16575074 stat could support birthtime/crtime on ZFS
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1833
0edb05d72e6b 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 987
diff changeset
     1
Properly detect remote mounted file systems with /usr/gnu/bin/df on Solaris.
0edb05d72e6b 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 987
diff changeset
     2
See the comments in CR# 15595871 for more details.
0edb05d72e6b 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 987
diff changeset
     3
987
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     4
--- coreutils-8.16/lib/mountlist.c.orig	2012-04-18 07:41:27.645801306 -0700
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     5
+++ coreutils-8.16/lib/mountlist.c	2012-04-18 07:42:23.796304225 -0700
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     6
@@ -187,10 +187,11 @@
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     7
 #endif
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     8
 
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     9
 #ifndef ME_REMOTE
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    10
-/* A file system is "remote" if its Fs_name contains a ':'
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    11
-   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//').  */
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    12
+/* A file system is `remote' if its Fs_name contains a `:' (and isn't of 
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    13
+   type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    14
+   with `//').  */
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    15
 # define ME_REMOTE(Fs_name, Fs_type)            \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    16
-    (strchr (Fs_name, ':') != NULL              \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    17
+    ((strchr (Fs_name, ':') != NULL && strcmp (Fs_type, "pcfs") != 0) \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    18
      || ((Fs_name)[0] == '/'                    \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    19
          && (Fs_name)[1] == '/'                 \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    20
          && (strcmp (Fs_type, "smbfs") == 0     \