"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/lstat.c" between
le-1.16.5.tar.gz and le-1.16.6.tar.gz

About: le is a terminal text editor (many block operations with stream and rectangular blocks, tunable syntax highlighting, etc.).

lstat.c  (le-1.16.5):lstat.c  (le-1.16.6)
/* Work around a bug of lstat on some systems /* Work around a bug of lstat on some systems
Copyright (C) 1997-2006, 2008-2017 Free Software Foundation, Inc. Copyright (C) 1997-2006, 2008-2019 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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 <https://www.gnu.org/licenses/>. */
/* written by Jim Meyering */ /* written by Jim Meyering */
/* If the user's config.h happens to include <sys/stat.h>, let it include only /* 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 the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
rpl_lstat. */ rpl_lstat. */
#define __need_system_sys_stat_h #define __need_system_sys_stat_h
#include <config.h> #include <config.h>
#if !HAVE_LSTAT #if !HAVE_LSTAT
skipping to change at line 50 skipping to change at line 50
{ {
return lstat (filename, buf); return lstat (filename, buf);
} }
/* Specification. */ /* Specification. */
/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc /* 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> eliminates this include because of the preliminary #include <sys/stat.h>
above. */ above. */
# include "sys/stat.h" # include "sys/stat.h"
# include "stat-time.h"
# include <string.h> # include <string.h>
# include <errno.h> # include <errno.h>
/* lstat works differently on Linux and Solaris systems. POSIX (see /* lstat works differently on Linux and Solaris systems. POSIX (see
"pathname resolution" in the glossary) requires that programs like "pathname resolution" in the glossary) requires that programs like
'ls' take into consideration the fact that FILE has a trailing slash '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 when FILE is a symbolic link. On Linux and Solaris 10 systems, the
lstat function already has the desired semantics (in treating lstat function already has the desired semantics (in treating
'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)', 'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)',
but on Solaris 9 and earlier it does not. but on Solaris 9 and earlier it does not.
If FILE has a trailing slash and specifies a symbolic link, If FILE has a trailing slash and specifies a symbolic link,
then use stat() to get more info on the referent of FILE. then use stat() to get more info on the referent of FILE.
If the referent is a non-directory, then set errno to ENOTDIR If the referent is a non-directory, then set errno to ENOTDIR
and return -1. Otherwise, return stat's result. */ and return -1. Otherwise, return stat's result. */
int int
rpl_lstat (const char *file, struct stat *sbuf) rpl_lstat (const char *file, struct stat *sbuf)
{ {
size_t len; int result = orig_lstat (file, sbuf);
int lstat_result = orig_lstat (file, sbuf);
if (lstat_result != 0)
return lstat_result;
/* This replacement file can blindly check against '/' rather than /* This replacement file can blindly check against '/' rather than
using the ISSLASH macro, because all platforms with '\\' either using the ISSLASH macro, because all platforms with '\\' either
lack symlinks (mingw) or have working lstat (cygwin) and thus do lack symlinks (mingw) or have working lstat (cygwin) and thus do
not compile this file. 0 len should have already been filtered not compile this file. 0 len should have already been filtered
out above, with a failure return of ENOENT. */ out above, with a failure return of ENOENT. */
len = strlen (file); if (result == 0)
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; if (S_ISDIR (sbuf->st_mode) || file[strlen (file) - 1] != '/')
return -1; result = stat_time_normalize (result, sbuf);
else
{
/* At this point, a trailing slash is permitted only 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;
}
result = stat (file, sbuf);
}
} }
return stat (file, sbuf); return result;
} }
#endif /* HAVE_LSTAT */ #endif /* HAVE_LSTAT */
 End of changes. 7 change blocks. 
20 lines changed or deleted 23 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)