aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2023-07-12 13:45:24 +0200
committerCorinna Vinschen <corinna@vinschen.de>2023-07-26 15:14:27 +0200
commit00510919993da49cf91421fe13242a7d8a82c1fd (patch)
tree8a49b5d4368464a97dbd31794a4c754fcdbc3b6d
parenta891dc7605b565282a1274198c9e4a033cafc348 (diff)
downloadnewlib-00510919993da49cf91421fe13242a7d8a82c1fd.zip
newlib-00510919993da49cf91421fe13242a7d8a82c1fd.tar.gz
newlib-00510919993da49cf91421fe13242a7d8a82c1fd.tar.bz2
Cygwin: use new _AT_NULL_PATHNAME_ALLOWED flag
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. Reviewed-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/cygwin/syscalls.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 8d3ec46..9c7ad61 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -4416,11 +4416,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;
@@ -4678,7 +4677,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);
}