| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Thu, 26 Jan 2017 12:24:45 +0100 | |
| branch | s11u3-sru |
| changeset 7627 | 4758b76d5ad5 |
| parent 3910 | 7a5d3958d427 |
| permissions | -rw-r--r-- |
|
7627
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
1 |
# Solaris-specific. The famous access(2) bug that will return |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
2 |
# X_OK even if the execute bit isn't set. |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
3 |
# So, we want to use stat(2) instead, which returns the actual |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
4 |
# permission bits. |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
5 |
# |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
6 |
# I do know nothing about the mentioned bug, keeping the patch just to be sure. |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
7 |
# |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
8 |
# Not suitable for upstream |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
9 |
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
10 |
--- lib/sh/eaccess.c 2015-04-02 10:24:43.401129429 -0700 |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
11 |
+++ lib/sh/eaccess.c 2015-04-02 10:28:57.704781076 -0700 |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
12 |
@@ -211,7 +211,8 @@ |
|
3910
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
if (path_is_devfd (path)) |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
return (sh_stataccess (path, mode)); |
|
7a5d3958d427
15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
|
|
7627
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
16 |
-#if (defined (HAVE_FACCESSAT) && defined (AT_EACCESS)) || defined (HAVE_EACCESS) |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
17 |
+#if ((defined (HAVE_FACCESSAT) && defined (AT_EACCESS)) || \ |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
18 |
+ defined (HAVE_EACCESS)) && !defined(SOLARIS) |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
19 |
# if defined (HAVE_FACCESSAT) && defined (AT_EACCESS) |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
20 |
ret = faccessat (AT_FDCWD, path, mode, AT_EACCESS); |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
3910
diff
changeset
|
21 |
# else /* HAVE_EACCESS */ /* FreeBSD */ |