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/bash/patches/solaris-023.eaccess.c.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 19 Sep 2016 00:22:44 -0700
changeset 6954 bdf0b42d8cef
parent 5518 c47fe0edc204
child 7486 57b5a32e1ae4
permissions -rw-r--r--
23245488 Move numpy 1.9.0 to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     1
 
# Solaris-specific. The famous access(2) bug that will return
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     2
 
# X_OK even if the execute bit isn't set.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     3
 
# So, we want to use stat(2) instead, which returns the actual
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     4
 
# permission bits.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     5
 
--- lib/sh/eaccess.c	2015-04-02 10:24:43.401129429 -0700
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     6
 
+++ lib/sh/eaccess.c	2015-04-02 10:28:57.704781076 -0700
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
     7
 
@@ -211,7 +211,8 @@
3871
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
   if (path_is_devfd (path))
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
     return (sh_stataccess (path, mode));
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
    11
 
-#if (defined (HAVE_FACCESSAT) && defined (AT_EACCESS)) || defined (HAVE_EACCESS)
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
    12
 
+#if ((defined (HAVE_FACCESSAT) && defined (AT_EACCESS)) || \
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
    13
 
+    defined (HAVE_EACCESS)) && !defined(SOLARIS)
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
    14
 
 #  if defined (HAVE_FACCESSAT) && defined (AT_EACCESS)
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
    15
 
   ret = faccessat (AT_FDCWD, path, mode, AT_EACCESS);
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 3871
diff changeset 
    16
 
 #  else		/* HAVE_EACCESS */	/* FreeBSD */
upstream/oracle/userland-gate