projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New upstream version 1.9
[debian/gzip]
/
lib
/
fstatat.c
diff --git
a/lib/fstatat.c
b/lib/fstatat.c
index ebbecfd14abdf1e2785f85d729fecb8f5ce025e2..63ceceb6d86a355111fe629aaa705c355e58d0cd 100644
(file)
--- a/
lib/fstatat.c
+++ b/
lib/fstatat.c
@@
-1,6
+1,6
@@
/* Work around an fstatat bug on Solaris 9.
/* Work around an fstatat bug on Solaris 9.
- Copyright (C) 2006, 2009-201
6
Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009-201
8
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-13,7
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
+ along with this program. If not, see <http
s
://www.gnu.org/licenses/>. */
/* Written by Paul Eggert and Jim Meyering. */
/* Written by Paul Eggert and Jim Meyering. */
@@
-28,7
+28,7
@@
#include <sys/stat.h>
#undef __need_system_sys_stat_h
#include <sys/stat.h>
#undef __need_system_sys_stat_h
-#if HAVE_FSTATAT
+#if HAVE_FSTATAT
&& HAVE_WORKING_FSTATAT_ZERO_FLAG
static int
orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
{
static int
orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
{
@@
-41,6
+41,8
@@
orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
above. */
#include "sys/stat.h"
above. */
#include "sys/stat.h"
+#include "stat-time.h"
+
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
@@
-51,6
+53,12
@@
orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
# define LSTAT_FOLLOWS_SLASHED_SYMLINK 0
# endif
# define LSTAT_FOLLOWS_SLASHED_SYMLINK 0
# endif
+static int
+normal_fstatat (int fd, char const *file, struct stat *st, int flag)
+{
+ return stat_time_normalize (orig_fstatat (fd, file, st, flag), st);
+}
+
/* fstatat should always follow symbolic links that end in /, but on
Solaris 9 it doesn't if AT_SYMLINK_NOFOLLOW is specified.
Likewise, trailing slash on a non-directory should be an error.
/* fstatat should always follow symbolic links that end in /, but on
Solaris 9 it doesn't if AT_SYMLINK_NOFOLLOW is specified.
Likewise, trailing slash on a non-directory should be an error.
@@
-63,7
+71,7
@@
orig_fstatat (int fd, char const *filename, struct stat *buf, int flags)
int
rpl_fstatat (int fd, char const *file, struct stat *st, int flag)
{
int
rpl_fstatat (int fd, char const *file, struct stat *st, int flag)
{
- int result =
orig
_fstatat (fd, file, st, flag);
+ int result =
normal
_fstatat (fd, file, st, flag);
size_t len;
if (LSTAT_FOLLOWS_SLASHED_SYMLINK || result != 0)
size_t len;
if (LSTAT_FOLLOWS_SLASHED_SYMLINK || result != 0)
@@
-79,7
+87,7
@@
rpl_fstatat (int fd, char const *file, struct stat *st, int flag)
errno = ENOTDIR;
return -1;
}
errno = ENOTDIR;
return -1;
}
- result =
orig
_fstatat (fd, file, st, flag & ~AT_SYMLINK_NOFOLLOW);
+ result =
normal
_fstatat (fd, file, st, flag & ~AT_SYMLINK_NOFOLLOW);
}
/* Fix stat behavior. */
if (result == 0 && !S_ISDIR (st->st_mode) && file[len - 1] == '/')
}
/* Fix stat behavior. */
if (result == 0 && !S_ISDIR (st->st_mode) && file[len - 1] == '/')
@@
-111,7
+119,7
@@
stat_func (char const *name, struct stat *st)
# endif
/* Replacement for Solaris' function by the same name.
# endif
/* Replacement for Solaris' function by the same name.
- <http
://www.google.com/search?q=fstatat+site:docs.sun
.com>
+ <http
s://www.google.com/search?q=fstatat+site:docs.oracle
.com>
First, try to simulate it via l?stat ("/proc/self/fd/FD/FILE").
Failing that, simulate it via save_cwd/fchdir/(stat|lstat)/restore_cwd.
If either the save_cwd or the restore_cwd fails (relatively unlikely),
First, try to simulate it via l?stat ("/proc/self/fd/FD/FILE").
Failing that, simulate it via save_cwd/fchdir/(stat|lstat)/restore_cwd.
If either the save_cwd or the restore_cwd fails (relatively unlikely),