Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/coreutils/patches/mountlist.c.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 2399 20c46127e17a
child 1833 0edb05d72e6b
child 5249 8a7aa7f8367e
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2399
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
     1
 
--- 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 
     2
 
+++ 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 
     3
 
@@ -187,10 +187,11 @@
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
     4
 
 #endif
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
     5
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
     6
 
 #ifndef ME_REMOTE
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
     7
 
-/* 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 
     8
 
-   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 
     9
 
+/* 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 
    10
 
+   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 
    11
 
+   with `//').  */
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
    12
 
 # 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 
    13
 
-    (strchr (Fs_name, ':') != NULL              \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
    14
 
+    ((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 
    15
 
      || ((Fs_name)[0] == '/'                    \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
    16
 
          && (Fs_name)[1] == '/'                 \
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents: 581
diff changeset 
    17
 
          && (strcmp (Fs_type, "smbfs") == 0     \
upstream/oracle/userland-gate