components/coreutils/patches/mountlist.c.patch
author pkidd <patrick.kidd@oracle.com>
Wed, 09 Nov 2016 09:18:21 -0800
branchs11u3-sru14-backport
changeset 7283 645e6b8527b6
parent 5249 8a7aa7f8367e
permissions -rw-r--r--
Added tag S11.3SRU14.6, 0.175.3.14.0.6.0 for changeset eaaa4b66f543
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5249
8a7aa7f8367e 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 2399
diff changeset
     1
Properly detect remote mounted file systems with /usr/gnu/bin/df on Solaris.
8a7aa7f8367e 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 2399
diff changeset
     2
See the comments in CR# 15595871 for more details.
8a7aa7f8367e 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 2399
diff changeset
     3
8a7aa7f8367e 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 2399
diff changeset
     4
This patch has not been passed upstream yet. It needs to be reworked into
8a7aa7f8367e 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 2399
diff changeset
     5
a format that would be acceptable.
8a7aa7f8367e 16575074 stat could support birthtime/crtime on ZFS
Rich Burridge <rich.burridge@oracle.com>
parents: 2399
diff changeset
     6
2399
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     7
--- coreutils-8.16/lib/mountlist.c.orig	2012-04-18 07:41:27.645801306 -0700
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     8
+++ coreutils-8.16/lib/mountlist.c	2012-04-18 07:42:23.796304225 -0700
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
     9
@@ -187,10 +187,11 @@
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    10
 #endif
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    11
 
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    12
 #ifndef ME_REMOTE
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    13
-/* A file system is "remote" if its Fs_name contains a ':'
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    14
-   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//').  */
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    15
+/* A file system is `remote' if its Fs_name contains a `:' (and isn't of 
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    16
+   type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    17
+   with `//').  */
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    18
 # define ME_REMOTE(Fs_name, Fs_type)            \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    19
-    (strchr (Fs_name, ':') != NULL              \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    20
+    ((strchr (Fs_name, ':') != NULL && strcmp (Fs_type, "pcfs") != 0) \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    21
      || ((Fs_name)[0] == '/'                    \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    22
          && (Fs_name)[1] == '/'                 \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    23
          && (strcmp (Fs_type, "smbfs") == 0     \