qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Accept null arguments for utimensat pathname 

This matches kernel behavior.  With this change, it is possible
to use utimensat as a replacement for the futimens interface,
similar to what glibc does internally.

Reviewed-by: Paul Eggert <eggert@cs.ucla.edu>
This commit is contained in:
Florian Weimer 2024-12-19 20:56:44 +01:00
parent 30d3fd7f4f
commit 70d0836305
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io/sys/stat.h
View File

@ -433,13 +433,13 @@ extern int mkfifoat (int __fd, const char *__path, __mode_t __mode)
extern int utimensat (int __fd, const char *__path,
const struct timespec __times[2],
int __flags)
__THROW __nonnull ((2));
__THROW;
# else
# ifdef __REDIRECT_NTH
extern int __REDIRECT_NTH (utimensat, (int fd, const char *__path,
const struct timespec __times[2],
int flags),
__utimensat64) __nonnull ((2));
__utimensat64);
# else
# define utimensat __utimensat64
# endif

32
io/tst-utimensat.c
View File

@ -39,6 +39,38 @@ test_utimesat_helper (const char *testfile, int fd, const char *testlink,
TEST_COMPARE (st.stx_mtime.tv_sec, ts[1].tv_sec);
}
/* Alter the timestamp using a NULL path. */
{
struct timespec ts1[2] = {ts[0], ts[1]};
ts1[0].tv_sec ^= 1;
ts1[1].tv_sec ^= 1;
TEST_VERIFY_EXIT (utimensat (fd, NULL, ts1, 0) == 0);
struct statx st;
xstatx (fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS, &st);
/* Check if seconds for atime match */
TEST_COMPARE (st.stx_atime.tv_sec, ts[0].tv_sec ^ 1);
/* Check if seconds for mtime match */
TEST_COMPARE (st.stx_mtime.tv_sec, ts[1].tv_sec ^ 1);
}
/* And switch it back using a NULL path. */
{
TEST_VERIFY_EXIT (utimensat (fd, NULL, ts, 0) == 0);
struct statx st;
xstatx (fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS, &st);
/* Check if seconds for atime match */
TEST_COMPARE (st.stx_atime.tv_sec, ts[0].tv_sec);
/* Check if seconds for mtime match */
TEST_COMPARE (st.stx_mtime.tv_sec, ts[1].tv_sec);
}
{
struct statx stfile_orig;
xstatx (AT_FDCWD, testfile, AT_SYMLINK_NOFOLLOW, STATX_BASIC_STATS,

3
sysdeps/unix/sysv/linux/utimensat.c
View File

@ -75,9 +75,6 @@ int
__utimensat64 (int fd, const char *file, const struct __timespec64 tsp64[2],
int flags)
{
if (file == NULL)
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
return __utimensat64_helper (fd, file, &tsp64[0], flags);
}