components/coreutils/patches/mountlist.c.patch
author Enrico Perla <enrico.perla@oracle.com>
Fri, 04 Nov 2016 05:32:50 -0700
changeset 7245 934578b959f0
parent 2050 7c6a1559c620
child 7476 c2f56b2bf427
permissions -rw-r--r--
20029192 Userland should build with ld -z sx=nx* flags instead of map.noexstk 23118364 Enable ADIHEAP on security sensitive binaries 23118359 Build openssh as PIE
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
2050
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
     4
This patch has not been passed upstream yet. It needs to be reworked into
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
     5
a format that would be acceptable.
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
     6
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
     7
--- lib/mountlist.c.orig	2014-07-27 14:40:04.634723388 -0700
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
     8
+++ lib/mountlist.c	2014-07-27 14:40:58.062935347 -0700
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
     9
@@ -212,10 +212,11 @@
987
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    10
 #endif
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    11
 
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    12
 #ifndef ME_REMOTE
810b92005f34 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 ':'
810b92005f34 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 '//').  */
2050
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
    15
+/* A file system is `remote' if its Fs_name contains a `:' (and isn't of
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
    16
++   type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts
7c6a1559c620 PSARC 2014/271 GNU coreutils 8.23
Rich Burridge <rich.burridge@oracle.com>
parents: 1833
diff changeset
    17
++   with `//').  */
987
810b92005f34 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)            \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    19
-    (strchr (Fs_name, ':') != NULL              \
810b92005f34 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) \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    21
      || ((Fs_name)[0] == '/'                    \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    22
          && (Fs_name)[1] == '/'                 \
810b92005f34 PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset
    23
          && (strcmp (Fs_type, "smbfs") == 0     \