diff options
| author | Paul Eggert | 2019-04-24 17:41:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-04-24 17:42:09 -0700 |
| commit | 2bf957394cdcb93396966d3289f5e200886cb424 (patch) | |
| tree | 99f1f3af3c339638cfd622ec7fd1949ff1c3e3e0 /lib-src | |
| parent | 445713f55561df9a9755ce13eec0c0324b1754c2 (diff) | |
| download | emacs-2bf957394cdcb93396966d3289f5e200886cb424.tar.gz emacs-2bf957394cdcb93396966d3289f5e200886cb424.zip | |
Improve port to platforms lacking euidaccess (Bug#35406)
* lib-src/emacsclient.c (set_local_socket):
Use faccessat with AT_EACCESS instead of using euidaccess.
* admin/merge-gnulib, lib/gnulib.mk.in, m4/gnulib-comp.m4:
Revert previous change.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 5871a18ce69..fd56007b156 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -1472,7 +1472,7 @@ set_local_socket (char const *server_name) | |||
| 1472 | int sockdirnamelen = snprintf (sockdirname, sizeof sockdirname, | 1472 | int sockdirnamelen = snprintf (sockdirname, sizeof sockdirname, |
| 1473 | "/run/user/%"PRIuMAX, id); | 1473 | "/run/user/%"PRIuMAX, id); |
| 1474 | if (0 <= sockdirnamelen && sockdirnamelen < sizeof sockdirname | 1474 | if (0 <= sockdirnamelen && sockdirnamelen < sizeof sockdirname |
| 1475 | && euidaccess (sockdirname, X_OK) == 0) | 1475 | && faccessat (AT_FDCWD, sockdirname, X_OK, AT_EACCESS) == 0) |
| 1476 | message | 1476 | message |
| 1477 | (true, | 1477 | (true, |
| 1478 | ("%s: Should XDG_RUNTIME_DIR='%s' be in the environment?\n" | 1478 | ("%s: Should XDG_RUNTIME_DIR='%s' be in the environment?\n" |