Browse Source
This patch is to import lstat gnulib module. gdb: 2014-11-28 Yao Qi <yao@codesourcery.com> * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add lstat. * gnulib/aclocal.m4: Re-generated. * gnulib/config.in: Re-generated. * gnulib/configure: Re-generated. * gnulib/import/Makefile.am: Re-generated. * gnulib/import/Makefile.in: Re-generated. * gnulib/import/m4/gnulib-cache.m4: Re-generated. * gnulib/import/m4/gnulib-comp.m4: Re-generated. * gnulib/import/lstat.c: New file. * gnulib/import/m4/lstat.m4: New file.gdb-7.9-branch
Yao Qi
12 years ago
11 changed files with 400 additions and 79 deletions
@ -0,0 +1,97 @@ |
|||
/* Work around a bug of lstat on some systems
|
|||
|
|||
Copyright (C) 1997-2006, 2008-2012 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 Jim Meyering */ |
|||
|
|||
/* 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_lstat doesn't recurse to |
|||
rpl_lstat. */ |
|||
#define __need_system_sys_stat_h |
|||
#include <config.h> |
|||
|
|||
#if !HAVE_LSTAT |
|||
/* On systems that lack symlinks, our replacement <sys/stat.h> already
|
|||
defined lstat as stat, so there is nothing further to do other than |
|||
avoid an empty file. */ |
|||
typedef int dummy; |
|||
#else /* HAVE_LSTAT */ |
|||
|
|||
/* Get the original definition of lstat. It might be defined as a macro. */ |
|||
# include <sys/types.h> |
|||
# include <sys/stat.h> |
|||
# undef __need_system_sys_stat_h |
|||
|
|||
static int |
|||
orig_lstat (const char *filename, struct stat *buf) |
|||
{ |
|||
return lstat (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 <string.h> |
|||
# include <errno.h> |
|||
|
|||
/* lstat works differently on Linux and Solaris systems. POSIX (see
|
|||
"pathname resolution" in the glossary) requires that programs like |
|||
'ls' take into consideration the fact that FILE has a trailing slash |
|||
when FILE is a symbolic link. On Linux and Solaris 10 systems, the |
|||
lstat function already has the desired semantics (in treating |
|||
'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)', |
|||
but on Solaris 9 and earlier it does not. |
|||
|
|||
If FILE has a trailing slash and specifies a symbolic link, |
|||
then use stat() to get more info on the referent of FILE. |
|||
If the referent is a non-directory, then set errno to ENOTDIR |
|||
and return -1. Otherwise, return stat's result. */ |
|||
|
|||
int |
|||
rpl_lstat (const char *file, struct stat *sbuf) |
|||
{ |
|||
size_t len; |
|||
int lstat_result = orig_lstat (file, sbuf); |
|||
|
|||
if (lstat_result != 0) |
|||
return lstat_result; |
|||
|
|||
/* This replacement file can blindly check against '/' rather than
|
|||
using the ISSLASH macro, because all platforms with '\\' either |
|||
lack symlinks (mingw) or have working lstat (cygwin) and thus do |
|||
not compile this file. 0 len should have already been filtered |
|||
out above, with a failure return of ENOENT. */ |
|||
len = strlen (file); |
|||
if (file[len - 1] != '/' || S_ISDIR (sbuf->st_mode)) |
|||
return 0; |
|||
|
|||
/* At this point, a trailing slash is only permitted on
|
|||
symlink-to-dir; but it should have found information on the |
|||
directory, not the symlink. Call stat() to get info about the |
|||
link's referent. Our replacement stat guarantees valid results, |
|||
even if the symlink is not pointing to a directory. */ |
|||
if (!S_ISLNK (sbuf->st_mode)) |
|||
{ |
|||
errno = ENOTDIR; |
|||
return -1; |
|||
} |
|||
return stat (file, sbuf); |
|||
} |
|||
|
|||
#endif /* HAVE_LSTAT */ |
|||
@ -0,0 +1,73 @@ |
|||
# serial 26 |
|||
|
|||
# Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc. |
|||
# |
|||
# This file is free software; the Free Software Foundation |
|||
# gives unlimited permission to copy and/or distribute it, |
|||
# with or without modifications, as long as this notice is preserved. |
|||
|
|||
dnl From Jim Meyering. |
|||
|
|||
AC_DEFUN([gl_FUNC_LSTAT], |
|||
[ |
|||
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) |
|||
dnl If lstat does not exist, the replacement <sys/stat.h> does |
|||
dnl "#define lstat stat", and lstat.c is a no-op. |
|||
AC_CHECK_FUNCS_ONCE([lstat]) |
|||
if test $ac_cv_func_lstat = yes; then |
|||
AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) |
|||
case "$gl_cv_func_lstat_dereferences_slashed_symlink" in |
|||
*no) |
|||
REPLACE_LSTAT=1 |
|||
;; |
|||
esac |
|||
else |
|||
HAVE_LSTAT=0 |
|||
fi |
|||
]) |
|||
|
|||
# Prerequisites of lib/lstat.c. |
|||
AC_DEFUN([gl_PREREQ_LSTAT], [:]) |
|||
|
|||
AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], |
|||
[ |
|||
dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it |
|||
dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ. |
|||
AC_CACHE_CHECK([whether lstat correctly handles trailing slash], |
|||
[gl_cv_func_lstat_dereferences_slashed_symlink], |
|||
[rm -f conftest.sym conftest.file |
|||
echo >conftest.file |
|||
if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then |
|||
AC_RUN_IFELSE( |
|||
[AC_LANG_PROGRAM( |
|||
[AC_INCLUDES_DEFAULT], |
|||
[[struct stat sbuf; |
|||
/* Linux will dereference the symlink and fail, as required by |
|||
POSIX. That is better in the sense that it means we will not |
|||
have to compile and use the lstat wrapper. */ |
|||
return lstat ("conftest.sym/", &sbuf) == 0; |
|||
]])], |
|||
[gl_cv_func_lstat_dereferences_slashed_symlink=yes], |
|||
[gl_cv_func_lstat_dereferences_slashed_symlink=no], |
|||
[case "$host_os" in |
|||
# Guess yes on glibc systems. |
|||
*-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; |
|||
# If we don't know, assume the worst. |
|||
*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; |
|||
esac |
|||
]) |
|||
else |
|||
# If the 'ln -s' command failed, then we probably don't even |
|||
# have an lstat function. |
|||
gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" |
|||
fi |
|||
rm -f conftest.sym conftest.file |
|||
]) |
|||
case "$gl_cv_func_lstat_dereferences_slashed_symlink" in |
|||
*yes) |
|||
AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1], |
|||
[Define to 1 if 'lstat' dereferences a symlink specified |
|||
with a trailing slash.]) |
|||
;; |
|||
esac |
|||
]) |
|||
Loading…
Reference in new issue