Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync with upstream's AT_EMPTY_PATH patch series #56

Merged
merged 5 commits into from
Aug 29, 2023
Merged

Sync with upstream's AT_EMPTY_PATH patch series #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76b408b
fixup! fchmodat/fstatat: fix regression with empty `pathname`
dscho Jul 26, 2023
6c91faa
Cygwin: gen_full_path_at: drop never reached code
github-cygwin Jul 12, 2023
c606f1d
Define _AT_NULL_PATHNAME_ALLOWED
github-cygwin Jul 12, 2023
cb6bc40
Cygwin: use new _AT_NULL_PATHNAME_ALLOWED flag
github-cygwin Jul 12, 2023
047b541
Cygwin: Fix and streamline AT_EMPTY_PATH handling
github-cygwin Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions newlib/libc/include/sys/_default_fcntl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,13 @@ extern "C" {
#define AT_FDCWD -2

/* Flag values for faccessat2) et al. */
#define AT_EACCESS 1
#define AT_SYMLINK_NOFOLLOW 2
#define AT_SYMLINK_FOLLOW 4
#define AT_REMOVEDIR 8
#define AT_EACCESS 0x0001
#define AT_SYMLINK_NOFOLLOW 0x0002
#define AT_SYMLINK_FOLLOW 0x0004
#define AT_REMOVEDIR 0x0008
#if __GNU_VISIBLE
#define AT_EMPTY_PATH 16
#define AT_EMPTY_PATH 0x0010
#define _AT_NULL_PATHNAME_ALLOWED 0x4000 /* Internal flag used by futimesat */
#endif
#endif

Expand Down
61 changes: 15 additions & 46 deletions winsup/cygwin/syscalls.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -4440,22 +4439,19 @@ gen_full_path_at (char *path_ret, int dirfd, const char *pathname,
cygheap_fdget cfd (dirfd);
if (cfd < 0)
return -1;
if (!cfd->pc.isdir ())
if (!cfd->pc.isdir () && !(flags & AT_EMPTY_PATH))
{
set_errno (ENOTDIR);
return -1;
}
p = stpcpy (path_ret, cfd->get_name ());
}
if (!p)
{
set_errno (ENOTDIR);
return -1;
}
if (pathname)
{
if (!*pathname)
{
if (flags & AT_EMPTY_PATH)
return 0;
set_errno (ENOENT);
return -1;
}
Expand Down Expand Up @@ -4577,29 +4573,14 @@ fchownat (int dirfd, const char *pathname, uid_t uid, gid_t gid, int flags)
__leave;
}
char *path = tp.c_get ();
int res = gen_full_path_at (path, dirfd, pathname);
int res = gen_full_path_at (path, dirfd, pathname, flags);
if (res)
__leave;
if (!*pathname) /* Implies AT_EMPTY_PATH */
{
if (!((errno == ENOENT || errno == ENOTDIR) && (flags & AT_EMPTY_PATH)))
__leave;
/* pathname is an empty string. Operate on dirfd. */
if (dirfd == AT_FDCWD)
{
cwdstuff::acquire_read ();
strcpy (path, cygheap->cwd.get_posix ());
cwdstuff::release_read ();
}
else
{
cygheap_fdget cfd (dirfd);
if (cfd < 0)
__leave;
strcpy (path, cfd->get_name ());
/* If dirfd refers to a symlink (which was necessarily
opened with O_PATH | O_NOFOLLOW), we must operate
directly on that symlink.. */
flags = AT_SYMLINK_NOFOLLOW;
}
/* If dirfd refers to a symlink (which was necessarily opened with
O_PATH | O_NOFOLLOW), we must operate directly on that symlink. */
flags = AT_SYMLINK_NOFOLLOW;
}
return chown_worker (path, (flags & AT_SYMLINK_NOFOLLOW)
? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW, uid, gid);
Expand All @@ -4622,21 +4603,9 @@ fstatat (int dirfd, const char *__restrict pathname, struct stat *__restrict st,
__leave;
}
char *path = tp.c_get ();
int res = gen_full_path_at (path, dirfd, pathname);
int res = gen_full_path_at (path, dirfd, pathname, flags);
if (res)
{
if (!((errno == ENOENT || errno == ENOTDIR) && (flags & AT_EMPTY_PATH)))
__leave;
/* pathname is an empty string. Operate on dirfd. */
if (dirfd == AT_FDCWD)
{
cwdstuff::acquire_read ();
strcpy (path, cygheap->cwd.get_posix ());
cwdstuff::release_read ();
}
else
return fstat (dirfd, st);
}
__leave;
path_conv pc (path, ((flags & AT_SYMLINK_NOFOLLOW)
? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW)
| PC_POSIX | PC_KEEP_HANDLE, stat_suffixes);
Expand Down Expand Up @@ -4681,7 +4650,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);
}
Expand Down