mirror of
https://https.git.savannah.gnu.org/git/gnulib.git
synced 2026-06-15 23:35:50 +00:00
Paul Eggert
76cfe20c72
stat-macros.h is now for our own macros, whereas stat_h is for macros in the <sys/stat.h> name space. * lib/stat-macros.h: Remove copyright notice, as this file is now tiny. (STAT_MACROS_H): Remove. (S_IFMT, S_ISBLK, S_ISCHR, S_ISDIR, S_ISFIFO, S_ISLNK, S_ISNAM): (S_ISMPB, S_ISMPC, S_ISNWK, S_ISREG, S_ISSOCK, S_ISDOOR, S_ISPORT): (S_TYPEISMQ, S_TYPEISTMO, S_TYPEISSEM, S_TYPEISSHM, S_ISCTG, S_ISOFD): (S_ISOFL, S_ISWHT, S_ISUID, S_ISGID, S_ISVTX, S_IRUSR, S_IRGRP): (S_IROTH, S_IWUSR, S_IWGRP, S_IWOTH, S_IXUSR, S_IXGRP, S_IXOTH): (S_IRWXU, S_IRWXG, S_IRWXO, S_IXUGO, S_IRWXUGO): Move these macros to ... * lib/stat_.h: here. Don't include stat-macros.h. * lib/canonicalize.c: Don't include stat-macros.h. * lib/chown.c: Likewise. * lib/euidaccess.c: Likewise. * lib/file-type.c: Likewise. * lib/filemode.c: Likewise. * lib/glob.c: Likewise. * lib/isapipe.c: Likewise. * lib/lchown.c: Likewise. * lib/lstat.c: Likewise. * lib/mkdir-p.c: Likewise. * lib/rmdir.c: Likewise. * m4/lchown.m4 (gl_FUNC_LCHOWN): Don't require gl_STAT_MACROS. * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): Don't check for io.h unless mkdir isn't declared, to speed up 'configure'. Always create sys/stat.h, since it's unlikely any real sys/stat.h would define all the S_* symbols. * modules/canonicalize (Depends-on): Depend on sys_stat, not stat-macros. * modules/chown: Likewise. * modules/euidaccess: Likewise. * modules/filemode: Likewise. * modules/file-type: Likewise. * modules/glob: Likewise. * modules/isapipe: Likewise. * modules/lchown: Likewise. * modules/lstat: Likewise. * modules/mkancesdirs: Likewise. * modules/rmdir: Likewise. * modules/mkdir-p (Depends-on): Also depend on sys_stat. * modules/modechange: Likewise. * modules/stat-macros (Files): Remove m4/stat-macros.m4. (configure.ac): Remove gl_STAT_MACROS. * modules/sys_stat (Depends-on): Remove stat-macros.
77 lines
2.7 KiB
C
77 lines
2.7 KiB
C
/* Work around a bug of lstat on some systems
|
|
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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 2, 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, write to the Free Software Foundation,
|
|
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
|
|
|
/* written by Jim Meyering */
|
|
|
|
#include <config.h>
|
|
|
|
/* The specification of these functions is in sys_stat.h. But we cannot
|
|
include this include file here, because on some systems, a
|
|
"#define lstat lstat64" is being used, and sys_stat.h deletes this
|
|
definition. */
|
|
|
|
#include <sys/types.h>
|
|
#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 = lstat (file, sbuf);
|
|
|
|
if (lstat_result != 0 || !S_ISLNK (sbuf->st_mode))
|
|
return lstat_result;
|
|
|
|
len = strlen (file);
|
|
if (len == 0 || file[len - 1] != '/')
|
|
return 0;
|
|
|
|
/* FILE refers to a symbolic link and the name ends with a slash.
|
|
Call stat() to get info about the link's referent. */
|
|
|
|
/* If stat fails, then we do the same. */
|
|
if (stat (file, sbuf) != 0)
|
|
return -1;
|
|
|
|
/* If FILE references a directory, return 0. */
|
|
if (S_ISDIR (sbuf->st_mode))
|
|
return 0;
|
|
|
|
/* Here, we know stat succeeded and FILE references a non-directory.
|
|
But it was specified via a name including a trailing slash.
|
|
Fail with errno set to ENOTDIR to indicate the contradiction. */
|
|
errno = ENOTDIR;
|
|
return -1;
|
|
}
|