summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-03-09 04:33:03 -0400
committerJune McEnroe <june@causal.agency>2020-03-09 20:01:30 -0400
commite1331923f42fcbf718659c520a15f6189af0d0fc (patch)
tree3e069e6b345b520b378ddfc5c4ee020ca5bb41fb
parentReplace st_mtim with st_mtimespec (diff)
downloadsrc-e1331923f42fcbf718659c520a15f6189af0d0fc.tar.gz
src-e1331923f42fcbf718659c520a15f6189af0d0fc.zip
Replace eaccess with faccessat
-rw-r--r--bin/1sh/exec.c2
-rw-r--r--bin/1sh/test.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/bin/1sh/exec.c b/bin/1sh/exec.c
index 3eea5afa..7897e024 100644
--- a/bin/1sh/exec.c
+++ b/bin/1sh/exec.c
@@ -725,7 +725,7 @@ typecmd_impl(int argc, char **argv, int cmd, const char *path)
 						" a tracked alias for" : "",
 					    name);
 			} else {
-				if (eaccess(argv[i], X_OK) == 0) {
+				if (faccessat(AT_FDCWD, argv[i], X_OK, AT_EACCESS) == 0) {
 					if (cmd == TYPECMD_SMALLV)
 						out1fmt("%s\n", argv[i]);
 					else
diff --git a/bin/1sh/test.c b/bin/1sh/test.c
index 8e618cc7..fcebb292 100644
--- a/bin/1sh/test.c
+++ b/bin/1sh/test.c
@@ -23,6 +23,7 @@ __FBSDID("$FreeBSD: releng/12.1/bin/test/test.c 298232 2016-04-19 00:38:07Z arau
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdarg.h>
@@ -375,18 +376,18 @@ filstat(char *nm, enum token mode)
 
 	switch (mode) {
 	case FILRD:
-		return (eaccess(nm, R_OK) == 0);
+		return (faccessat(AT_FDCWD, nm, R_OK, AT_EACCESS) == 0);
 	case FILWR:
-		return (eaccess(nm, W_OK) == 0);
+		return (faccessat(AT_FDCWD, nm, W_OK, AT_EACCESS) == 0);
 	case FILEX:
 		/* XXX work around eaccess(2) false positives for superuser */
-		if (eaccess(nm, X_OK) != 0)
+		if (faccessat(AT_FDCWD, nm, X_OK, AT_EACCESS) != 0)
 			return 0;
 		if (S_ISDIR(s.st_mode) || geteuid() != 0)
 			return 1;
 		return (s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0;
 	case FILEXIST:
-		return (eaccess(nm, F_OK) == 0);
+		return (faccessat(AT_FDCWD, nm, F_OK, AT_EACCESS) == 0);
 	case FILREG:
 		return S_ISREG(s.st_mode);
 	case FILDIR: