From: Corinna Vinschen <cori...@vinschen.de>
Convert gen_full_path_at to take flag values from the caller, rather
than just a bool indicating that empty paths are allowed. This is in
preparation of a better AT_EMPTY_PATH handling in a followup patch.
Signed-off-by: Corinna Vinschen <cori...@vinschen.de>
---
winsup/cygwin/syscalls.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index f0ef8955cee8..cf8c4e0cfb9f 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -4414,11 +4414,10 @@ pclose (FILE *fp)
static int
gen_full_path_at (char *path_ret, int dirfd, const char *pathname,
- bool null_pathname_allowed = false)
+ int flags = 0)
{
- /* Set null_pathname_allowed to true to allow GLIBC compatible behaviour
- for NULL pathname. Only used by futimesat. */
- if (!pathname && !null_pathname_allowed)
+ /* futimesat allows a NULL pathname. */
+ if (!pathname && !(flags & _AT_NULL_PATHNAME_ALLOWED))
{
set_errno (EFAULT);
return -1;
@@ -4676,7 +4675,7 @@ futimesat (int dirfd, const char *pathname, const struct
timeval times[2])
__try
{
char *path = tp.c_get ();
- if (gen_full_path_at (path, dirfd, pathname, true))
+ if (gen_full_path_at (path, dirfd, pathname, _AT_NULL_PATHNAME_ALLOWED))
__leave;
return utimes (path, times);
}
--
2.40.1
