From 099734376dd5d303b5ec14de6531e3abea919843 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Mon, 9 Mar 2020 04:33:03 -0400
Subject: Replace eaccess with faccessat

---
 bin/1sh/exec.c | 2 +-
 bin/1sh/test.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'bin/1sh')

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:
-- 
cgit 1.4.1

ef='/src/log/?id=e0673650ccfba6d508a1a8ec79f0139d6f6127aa&amp;follow=1'>root</a>/<a href='/src/log/bin?id=e0673650ccfba6d508a1a8ec79f0139d6f6127aa&amp;follow=1'>bin</a>/<a href='/src/log/bin/pngo.c?id=e0673650ccfba6d508a1a8ec79f0139d6f6127aa&amp;follow=1'>pngo.c</a> (<a href='/src/log/bin/pngo.c?id=e0673650ccfba6d508a1a8ec79f0139d6f6127aa'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/pngo.c?id=e0673650ccfba6d508a1a8ec79f0139d6f6127aa&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-06-26 22:15:30 -0400'>2020-06-26</span></td><td><a href='/src/commit/txt/plan.7?id=8ca4eab26275403fd0b465f746ffe1bd41855aa7&amp;follow=1'>Add password non-manager to plan</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-06-26 22:08:02 -0400'>2020-06-26</span></td><td><a href='/src/commit/etc/tf/cfg/sniper.cfg?id=d4f46d9f60fe03f1ffab5493d3bef595b02798ed&amp;follow=1'>Tweak TF2 sensitivities once more</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-06-19 15:01:28 -0400'>2020-06-19</span></td><td><a href='/src/commit/www/text.causal.agency/010-irc-suite.7?id=99f323c67211b6f11c69aeaf655872718068b620&amp;follow=1'>Add note about litterbox bot use</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-06-19 14:43:16 -0400'>2020-06-19</span></td><td><a href='/src/commit/www/text.causal.agency/Makefile?id=f80e6e66a4e9c7046be8f1ba16fa694401d8adbb&amp;follow=1'>Publish "IRC suite"</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-06-17 17:51:52 -0400'>2020-06-17</span></td><td><a href='/src/commit/link.sh?id=4deb5379a9eb9dd10d2ddcf850a48d0e9228a950&amp;follow=1'>Add errors to link.sh</a></td><td>June McEnroe