libsupport: Add 64-bit time_t support for stat functions

The patch adds redirections for xstat, xlstat, and xfstat when
_TIME_BITS=64 is defined.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella 2021-02-26 09:59:27 -03:00
parent e9bc2b3b38
commit 372d2ef1f9
5 changed files with 112 additions and 0 deletions

View File

@ -40,7 +40,9 @@ libsupport-routines = \
resolv_test \ resolv_test \
set_fortify_handler \ set_fortify_handler \
support-xfstat \ support-xfstat \
support-xfstat-time64 \
support-xstat \ support-xstat \
support-xstat-time64 \
support_become_root \ support_become_root \
support_can_chroot \ support_can_chroot \
support_capture_subprocess \ support_capture_subprocess \
@ -117,6 +119,7 @@ libsupport-routines = \
xlisten \ xlisten \
xlseek \ xlseek \
xlstat \ xlstat \
xlstat-time64 \
xmalloc \ xmalloc \
xmemstream \ xmemstream \
xmkdir \ xmkdir \

View File

@ -0,0 +1,32 @@
/* 64-bit time_t stat with error checking.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* NB: Non-standard file name to avoid sysdeps override for xstat. */
#include <support/check.h>
#include <support/xunistd.h>
#include <sys/stat.h>
#if __TIMESIZE != 64
void
xfstat_time64 (int fd, struct __stat64_t64 *result)
{
if (__fstat64_time64 (fd, result) != 0)
FAIL_EXIT1 ("__fstat64_time64 (%d): %m", fd);
}
#endif

View File

@ -0,0 +1,32 @@
/* 64-bit time_t stat with error checking.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* NB: Non-standard file name to avoid sysdeps override for xstat. */
#include <support/check.h>
#include <support/xunistd.h>
#include <sys/stat.h>
#if __TIMESIZE != 64
void
xstat_time64 (const char *path, struct __stat64_t64 *result)
{
if (__stat64_time64 (path, result) != 0)
FAIL_EXIT1 ("__stat64_time64 (\"%s\"): %m", path);
}
#endif

32
support/xlstat-time64.c Normal file
View File

@ -0,0 +1,32 @@
/* 64-bit time_t stat with error checking.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* NB: Non-standard file name to avoid sysdeps override for xstat. */
#include <support/check.h>
#include <support/xunistd.h>
#include <sys/stat.h>
#if __TIMESIZE != 64
void
xlstat_time64 (const char *path, struct __stat64_t64 *result)
{
if (__lstat64_time64 (path, result) != 0)
FAIL_EXIT1 ("__lstat64_time64 (\"%s\"): %m", path);
}
#endif

View File

@ -24,6 +24,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
__BEGIN_DECLS __BEGIN_DECLS
@ -35,9 +36,21 @@ pid_t xwaitpid (pid_t, int *status, int flags);
void xpipe (int[2]); void xpipe (int[2]);
void xdup2 (int, int); void xdup2 (int, int);
int xopen (const char *path, int flags, mode_t); int xopen (const char *path, int flags, mode_t);
#ifndef __USE_TIME_BITS64
# ifdef __USE_FILE_OFFSET64
void xstat (const char *path, struct stat *);
void xlstat (const char *path, struct stat *);
void xfstat (int fd, struct stat *);
# else
void xstat (const char *path, struct stat64 *); void xstat (const char *path, struct stat64 *);
void xlstat (const char *path, struct stat64 *); void xlstat (const char *path, struct stat64 *);
void xfstat (int fd, struct stat64 *); void xfstat (int fd, struct stat64 *);
# endif
#else
void __REDIRECT (xstat, (const char *path, struct stat *), xstat_time64);
void __REDIRECT (xlstat, (const char *path, struct stat *), xlstat_time64);
void __REDIRECT (xfstat, (int fd, struct stat *), xfstat_time64);
#endif
void xmkdir (const char *path, mode_t); void xmkdir (const char *path, mode_t);
void xchroot (const char *path); void xchroot (const char *path);
void xunlink (const char *path); void xunlink (const char *path);