4a626d0a0f
2015-08-24 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 1029a8112290f6eee9d7878a391c49db42c999bd. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/basename-lgpl.c: Update. * gnulib/import/canonicalize-lgpl.c: Update. * gnulib/import/config.charset: Update. * gnulib/import/dirent.in.h: Update. * gnulib/import/dirfd.c: Update. * gnulib/import/dirname-lgpl.c: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno.in.h: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/float+.h: Update. * gnulib/import/float.c: Update. * gnulib/import/float.in.h: Update. * gnulib/import/fnmatch.c: Update. * gnulib/import/fnmatch.in.h: Update. * gnulib/import/fnmatch_loop.c: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp.c: Update. * gnulib/import/frexpl.c: Update. * gnulib/import/gettimeofday.c: Update. * gnulib/import/inttypes.in.h: Update. * gnulib/import/isnan.c: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand.c: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl.c: Update. * gnulib/import/itold.c: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat.c: Update. * gnulib/import/m4/00gnulib.m4: Update. * gnulib/import/m4/absolute-header.m4: Update. * gnulib/import/m4/alloca.m4: Update. * gnulib/import/m4/canonicalize.m4: Update. * gnulib/import/m4/codeset.m4: Update. * gnulib/import/m4/configmake.m4: Update. * gnulib/import/m4/dirent_h.m4: Update. * gnulib/import/m4/dirfd.m4: Update. * gnulib/import/m4/dirname.m4: Update. * gnulib/import/m4/double-slash-root.m4: Update. * gnulib/import/m4/eealloc.m4: Update. * gnulib/import/m4/errno_h.m4: Update. * gnulib/import/m4/exponentd.m4: Update. * gnulib/import/m4/exponentl.m4: Update. * gnulib/import/m4/extensions.m4: Update. * gnulib/import/m4/extern-inline.m4: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/float_h.m4: Update. * gnulib/import/m4/fnmatch.m4: Update. * gnulib/import/m4/fpieee.m4: Update. * gnulib/import/m4/frexp.m4: Update. * gnulib/import/m4/frexpl.m4: Update. * gnulib/import/m4/gettimeofday.m4: Update. * gnulib/import/m4/glibc21.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-common.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/gnulib-tool.m4: Update. * gnulib/import/m4/include_next.m4: Update. * gnulib/import/m4/inttypes-pri.m4: Update. * gnulib/import/m4/inttypes.m4: Update. * gnulib/import/m4/isnand.m4: Update. * gnulib/import/m4/isnanl.m4: Update. * gnulib/import/m4/largefile.m4: Update. * gnulib/import/m4/localcharset.m4: Update. * gnulib/import/m4/locale-fr.m4: Update. * gnulib/import/m4/locale-ja.m4: Update. * gnulib/import/m4/locale-zh.m4: Update. * gnulib/import/m4/longlong.m4: Update. * gnulib/import/m4/lstat.m4: Update. * gnulib/import/m4/malloc.m4: Update. * gnulib/import/m4/malloca.m4: Update. * gnulib/import/m4/math_h.m4: Update. * gnulib/import/m4/mbrtowc.m4: Update. * gnulib/import/m4/mbsinit.m4: Update. * gnulib/import/m4/mbsrtowcs.m4: Update. * gnulib/import/m4/mbstate_t.m4: Update. * gnulib/import/m4/memchr.m4: Update. * gnulib/import/m4/memmem.m4: Update. * gnulib/import/m4/mmap-anon.m4: Update. * gnulib/import/m4/multiarch.m4: Update. * gnulib/import/m4/nocrash.m4: Update. * gnulib/import/m4/off_t.m4: Update. * gnulib/import/m4/pathmax.m4: Update. * gnulib/import/m4/readlink.m4: Update. * gnulib/import/m4/rename.m4: Update. * gnulib/import/m4/rmdir.m4: Update. * gnulib/import/m4/ssize_t.m4: Update. * gnulib/import/m4/stat.m4: Update. * gnulib/import/m4/stdbool.m4: Update. * gnulib/import/m4/stddef_h.m4: Update. * gnulib/import/m4/stdint.m4: Update. * gnulib/import/m4/stdio_h.m4: Update. * gnulib/import/m4/stdlib_h.m4: Update. * gnulib/import/m4/string_h.m4: Update. * gnulib/import/m4/strstr.m4: Update. * gnulib/import/m4/strtok_r.m4: Update. * gnulib/import/m4/sys_socket_h.m4: Update. * gnulib/import/m4/sys_stat_h.m4: Update. * gnulib/import/m4/sys_time_h.m4: Update. * gnulib/import/m4/sys_types_h.m4: Update. * gnulib/import/m4/time_h.m4: Update. * gnulib/import/m4/unistd_h.m4: Update. * gnulib/import/m4/warn-on-use.m4: Update. * gnulib/import/m4/wchar_h.m4: Update. * gnulib/import/m4/wchar_t.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/m4/wint_t.m4: Update. * gnulib/import/malloc.c: Update. * gnulib/import/malloca.c: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math.in.h: Update. * gnulib/import/mbrtowc.c: Update. * gnulib/import/mbsinit.c: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state.c: Update. * gnulib/import/mbsrtowcs.c: Update. * gnulib/import/memchr.c: Update. * gnulib/import/memmem.c: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/readlink.c: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename.c: Update. * gnulib/import/rmdir.c: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/stat.c: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/stddef.in.h: Update. * gnulib/import/stdint.in.h: Update. * gnulib/import/stdio.c: Update. * gnulib/import/stdio.in.h: Update. * gnulib/import/stdlib.in.h: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/streq.h: Update. * gnulib/import/string.in.h: Update. * gnulib/import/stripslash.c: Update. * gnulib/import/strnlen1.c: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr.c: Update. * gnulib/import/strtok_r.c: Update. * gnulib/import/sys_stat.in.h: Update. * gnulib/import/sys_time.in.h: Update. * gnulib/import/sys_types.in.h: Update. * gnulib/import/time.in.h: Update. * gnulib/import/unistd.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar.in.h: Update. * gnulib/import/wctype.in.h: Update. * gnulib/import/gettimeofday.c: New file. * gnulib/import/m4/absolute-header.m4: New file. * gnulib/import/m4/gettimeofday.m4: New file. * gnulib/import/m4/sys_socket_h.m4: New file. * gnulib/import/m4/sys_time_h.m4: New file. * gnulib/import/stdio.c: Delete file. * gnulib/import/sys_time.in.h: New file.
138 lines
4.4 KiB
C
138 lines
4.4 KiB
C
/* Work around platform bugs in stat.
|
|
Copyright (C) 2009-2015 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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 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/>. */
|
|
|
|
/* written by Eric Blake */
|
|
|
|
/* If the user's config.h happens to include <sys/stat.h>, let it include only
|
|
the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
|
|
rpl_stat. */
|
|
#define __need_system_sys_stat_h
|
|
#include <config.h>
|
|
|
|
/* Get the original definition of stat. It might be defined as a macro. */
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#undef __need_system_sys_stat_h
|
|
|
|
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
|
# if _GL_WINDOWS_64_BIT_ST_SIZE
|
|
# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
|
|
# define stat _stati64
|
|
# define REPLACE_FUNC_STAT_DIR 1
|
|
# undef REPLACE_FUNC_STAT_FILE
|
|
# elif REPLACE_FUNC_STAT_FILE
|
|
/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a.
|
|
Bypass it. */
|
|
# define stat _stat
|
|
# define REPLACE_FUNC_STAT_DIR 1
|
|
# undef REPLACE_FUNC_STAT_FILE
|
|
# endif
|
|
#endif
|
|
|
|
static int
|
|
orig_stat (const char *filename, struct stat *buf)
|
|
{
|
|
return stat (filename, buf);
|
|
}
|
|
|
|
/* Specification. */
|
|
/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
|
|
eliminates this include because of the preliminary #include <sys/stat.h>
|
|
above. */
|
|
#include "sys/stat.h"
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include "dosname.h"
|
|
#include "verify.h"
|
|
|
|
#if REPLACE_FUNC_STAT_DIR
|
|
# include "pathmax.h"
|
|
/* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
|
|
have a constant PATH_MAX. */
|
|
# ifndef PATH_MAX
|
|
# error "Please port this replacement to your platform"
|
|
# endif
|
|
#endif
|
|
|
|
/* Store information about NAME into ST. Work around bugs with
|
|
trailing slashes. Mingw has other bugs (such as st_ino always
|
|
being 0 on success) which this wrapper does not work around. But
|
|
at least this implementation provides the ability to emulate fchdir
|
|
correctly. */
|
|
|
|
int
|
|
rpl_stat (char const *name, struct stat *st)
|
|
{
|
|
int result = orig_stat (name, st);
|
|
#if REPLACE_FUNC_STAT_FILE
|
|
/* Solaris 9 mistakenly succeeds when given a non-directory with a
|
|
trailing slash. */
|
|
if (result == 0 && !S_ISDIR (st->st_mode))
|
|
{
|
|
size_t len = strlen (name);
|
|
if (ISSLASH (name[len - 1]))
|
|
{
|
|
errno = ENOTDIR;
|
|
return -1;
|
|
}
|
|
}
|
|
#endif /* REPLACE_FUNC_STAT_FILE */
|
|
#if REPLACE_FUNC_STAT_DIR
|
|
|
|
if (result == -1 && errno == ENOENT)
|
|
{
|
|
/* Due to mingw's oddities, there are some directories (like
|
|
c:\) where stat() only succeeds with a trailing slash, and
|
|
other directories (like c:\windows) where stat() only
|
|
succeeds without a trailing slash. But we want the two to be
|
|
synonymous, since chdir() manages either style. Likewise, Mingw also
|
|
reports ENOENT for names longer than PATH_MAX, when we want
|
|
ENAMETOOLONG, and for stat("file/"), when we want ENOTDIR.
|
|
Fortunately, mingw PATH_MAX is small enough for stack
|
|
allocation. */
|
|
char fixed_name[PATH_MAX + 1] = {0};
|
|
size_t len = strlen (name);
|
|
bool check_dir = false;
|
|
verify (PATH_MAX <= 4096);
|
|
if (PATH_MAX <= len)
|
|
errno = ENAMETOOLONG;
|
|
else if (len)
|
|
{
|
|
strcpy (fixed_name, name);
|
|
if (ISSLASH (fixed_name[len - 1]))
|
|
{
|
|
check_dir = true;
|
|
while (len && ISSLASH (fixed_name[len - 1]))
|
|
fixed_name[--len] = '\0';
|
|
if (!len)
|
|
fixed_name[0] = '/';
|
|
}
|
|
else
|
|
fixed_name[len++] = '/';
|
|
result = orig_stat (fixed_name, st);
|
|
if (result == 0 && check_dir && !S_ISDIR (st->st_mode))
|
|
{
|
|
result = -1;
|
|
errno = ENOTDIR;
|
|
}
|
|
}
|
|
}
|
|
#endif /* REPLACE_FUNC_STAT_DIR */
|
|
return result;
|
|
}
|