author | Rich Burridge <rich.burridge@oracle.com> |
Tue, 02 May 2017 17:33:26 -0700 | |
changeset 7964 | d9801318ed3d |
parent 7476 | c2f56b2bf427 |
permissions | -rw-r--r-- |
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 |
|
7476
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
7 |
--- lib/mountlist.c.orig 2016-11-30 16:10:17.136191581 +0000 |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
8 |
+++ lib/mountlist.c 2016-11-30 16:33:57.209112678 +0000 |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
9 |
@@ -222,11 +222,12 @@ |
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 ':' |
7476
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
14 |
- or if (it is of type (smbfs or cifs) and its Fs_name starts with '//') |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
15 |
- or Fs_name is equal to "-hosts" (used by autofs to mount remote fs). */ |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
16 |
+/* A file system is "remote" if its Fs_name contains a ':' (and isn't of |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
17 |
+ type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
18 |
+ with '//') or Fs_name is equal to "-hosts" (used by autofs to mount |
c2f56b2bf427
PSARC 2016/622 GNU coreutils 8.26
Rich Burridge <rich.burridge@oracle.com>
parents:
2050
diff
changeset
|
19 |
+ remote fs). */ |
987
810b92005f34
PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
581
diff
changeset
|
20 |
# 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
|
21 |
- (strchr (Fs_name, ':') != NULL \ |
810b92005f34
PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
581
diff
changeset
|
22 |
+ ((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
|
23 |
|| ((Fs_name)[0] == '/' \ |
810b92005f34
PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
581
diff
changeset
|
24 |
&& (Fs_name)[1] == '/' \ |
810b92005f34
PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
581
diff
changeset
|
25 |
&& (strcmp (Fs_type, "smbfs") == 0 \ |