From 76cfe20c721a2dcefaabf27de32082458b51b281 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 27 Oct 2006 20:46:43 +0000 Subject: [PATCH] Move stat.h-substitute stuff from lib/stat-macros.h to lib/stat_.h. stat-macros.h is now for our own macros, whereas stat_h is for macros in the 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. --- ChangeLog | 49 ++++++++++ lib/canonicalize.c | 1 - lib/chown.c | 2 - lib/euidaccess.c | 1 - lib/file-type.c | 2 - lib/filemode.c | 2 - lib/glob.c | 1 - lib/isapipe.c | 2 - lib/lchown.c | 1 - lib/lstat.c | 2 - lib/mkdir-p.c | 1 - lib/rmdir.c | 2 - lib/stat-macros.h | 259 +-------------------------------------------------- lib/stat_.h | 229 ++++++++++++++++++++++++++++++++++++++++++++- m4/lchown.m4 | 3 +- m4/sys_stat_h.m4 | 22 ++--- modules/canonicalize | 2 +- modules/chown | 2 +- modules/euidaccess | 2 +- modules/file-type | 2 +- modules/filemode | 2 +- modules/glob | 2 +- modules/isapipe | 2 +- modules/lchown | 2 +- modules/lstat | 2 +- modules/mkancesdirs | 1 + modules/mkdir-p | 1 + modules/modechange | 1 + modules/rmdir | 2 +- modules/stat-macros | 2 - modules/sys_stat | 1 - 31 files changed, 300 insertions(+), 305 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22cf149e7..f0f5a8a95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +2006-10-27 Paul Eggert + + Move stat.h-substitute stuff from lib/stat-macros.h to lib/stat_.h. + stat-macros.h is now for our own macros, whereas stat_h is for + macros in the 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. + 2006-10-27 Bruno Haible * m4/signed.m4: Remove file. diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 63dfb6dc5..8c48b4205 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -36,7 +36,6 @@ #include "cycle-check.h" #include "filenamecat.h" -#include "stat-macros.h" #include "xalloc.h" #include "xgetcwd.h" diff --git a/lib/chown.c b/lib/chown.c index 5c8b32e02..1301aa6ad 100644 --- a/lib/chown.c +++ b/lib/chown.c @@ -33,8 +33,6 @@ #include #include -#include "stat-macros.h" - /* Provide a more-closely POSIX-conforming version of chown on systems with one or both of the following problems: - chown doesn't treat an ID of -1 as meaning diff --git a/lib/euidaccess.c b/lib/euidaccess.c index 384808666..5148a5b3e 100644 --- a/lib/euidaccess.c +++ b/lib/euidaccess.c @@ -67,7 +67,6 @@ #else # include "group-member.h" -# include "stat-macros.h" #endif diff --git a/lib/file-type.c b/lib/file-type.c index b6415c3fc..9fc7c524b 100644 --- a/lib/file-type.c +++ b/lib/file-type.c @@ -23,8 +23,6 @@ #include "file-type.h" -#include "stat-macros.h" - #include #define _(text) gettext (text) diff --git a/lib/filemode.c b/lib/filemode.c index 0d34161c0..726c331b7 100644 --- a/lib/filemode.c +++ b/lib/filemode.c @@ -21,8 +21,6 @@ #include "filemode.h" -#include "stat-macros.h" - /* The following is for Cray DMF (Data Migration Facility), which is a HSM file system. A migrated file has a `st_dm_mode' that is different from the normal `st_mode', so any tests for migrated diff --git a/lib/glob.c b/lib/glob.c index 38927d388..6f8641aad 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -134,7 +134,6 @@ #else /* !_LIBC */ # include "getlogin_r.h" # include "mempcpy.h" -# include "stat-macros.h" # include "strdup.h" # define __stat64(fname, buf) stat (fname, buf) # define struct_stat64 struct stat diff --git a/lib/isapipe.c b/lib/isapipe.c index 59b6f5481..83a9bf2cb 100644 --- a/lib/isapipe.c +++ b/lib/isapipe.c @@ -28,8 +28,6 @@ #include #include -#include "stat-macros.h" - /* The maximum link count for pipes; (nlink_t) -1 if not known. */ #ifndef PIPE_LINK_COUNT_MAX # define PIPE_LINK_COUNT_MAX ((nlink_t) (-1)) diff --git a/lib/lchown.c b/lib/lchown.c index c2a9ef6cd..fa0826edb 100644 --- a/lib/lchown.c +++ b/lib/lchown.c @@ -24,7 +24,6 @@ #include "lchown.h" #include -#include "stat-macros.h" /* Work just like chown, except when FILE is a symbolic link. In that case, set errno to EOPNOTSUPP and return -1. diff --git a/lib/lstat.c b/lib/lstat.c index bfa0d89b4..77dd22859 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -31,8 +31,6 @@ #include #include -#include "stat-macros.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 diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c index e6f8255b7..19b962bf0 100644 --- a/lib/mkdir-p.c +++ b/lib/mkdir-p.c @@ -36,7 +36,6 @@ #include "quote.h" #include "mkancesdirs.h" #include "savewd.h" -#include "stat-macros.h" #ifndef HAVE_FCHMOD # define HAVE_FCHMOD false diff --git a/lib/rmdir.c b/lib/rmdir.c index 1cc74395a..1221f4fef 100644 --- a/lib/rmdir.c +++ b/lib/rmdir.c @@ -23,8 +23,6 @@ #include #include -#include "stat-macros.h" - /* rmdir adapted from GNU tar. */ /* Remove directory DIR. diff --git a/lib/stat-macros.h b/lib/stat-macros.h index 829ddd35d..690216c74 100644 --- a/lib/stat-macros.h +++ b/lib/stat-macros.h @@ -1,260 +1,3 @@ -/* stat-related macros - - Copyright (C) 1993, 1994, 2001, 2002, 2004, 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 Paul Eggert and Jim Meyering. */ - -#ifndef STAT_MACROS_H -# define STAT_MACROS_H 1 - -# if ! defined S_ISREG && ! defined S_IFREG -# error "you must include before including this file" -# endif - -# ifndef S_IFMT -# define S_IFMT 0170000 -# endif - -# if STAT_MACROS_BROKEN -# undef S_ISBLK -# undef S_ISCHR -# undef S_ISDIR -# undef S_ISFIFO -# undef S_ISLNK -# undef S_ISNAM -# undef S_ISMPB -# undef S_ISMPC -# undef S_ISNWK -# undef S_ISREG -# undef S_ISSOCK -# endif - - -# ifndef S_ISBLK -# ifdef S_IFBLK -# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) -# else -# define S_ISBLK(m) 0 -# endif -# endif - -# ifndef S_ISCHR -# ifdef S_IFCHR -# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) -# else -# define S_ISCHR(m) 0 -# endif -# endif - -# ifndef S_ISDIR -# ifdef S_IFDIR -# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) -# else -# define S_ISDIR(m) 0 -# endif -# endif - -# ifndef S_ISDOOR /* Solaris 2.5 and up */ -# define S_ISDOOR(m) 0 -# endif - -# ifndef S_ISFIFO -# ifdef S_IFIFO -# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) -# else -# define S_ISFIFO(m) 0 -# endif -# endif - -# ifndef S_ISLNK -# ifdef S_IFLNK -# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) -# else -# define S_ISLNK(m) 0 -# endif -# endif - -# ifndef S_ISMPB /* V7 */ -# ifdef S_IFMPB -# define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) -# define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) -# else -# define S_ISMPB(m) 0 -# define S_ISMPC(m) 0 -# endif -# endif - -# ifndef S_ISNAM /* Xenix */ -# ifdef S_IFNAM -# define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM) -# else -# define S_ISNAM(m) 0 -# endif -# endif - -# ifndef S_ISNWK /* HP/UX */ -# ifdef S_IFNWK -# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) -# else -# define S_ISNWK(m) 0 -# endif -# endif - -# ifndef S_ISPORT /* Solaris 10 and up */ -# define S_ISPORT(m) 0 -# endif - -# ifndef S_ISREG -# ifdef S_IFREG -# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -# else -# define S_ISREG(m) 0 -# endif -# endif - -# ifndef S_ISSOCK -# ifdef S_IFSOCK -# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) -# else -# define S_ISSOCK(m) 0 -# endif -# endif - - -# ifndef S_TYPEISMQ -# define S_TYPEISMQ(p) 0 -# endif - -# ifndef S_TYPEISTMO -# define S_TYPEISTMO(p) 0 -# endif - - -# ifndef S_TYPEISSEM -# ifdef S_INSEM -# define S_TYPEISSEM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSEM) -# else -# define S_TYPEISSEM(p) 0 -# endif -# endif - -# ifndef S_TYPEISSHM -# ifdef S_INSHD -# define S_TYPEISSHM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSHD) -# else -# define S_TYPEISSHM(p) 0 -# endif -# endif - -/* high performance ("contiguous data") */ -# ifndef S_ISCTG -# define S_ISCTG(p) 0 -# endif - -/* Cray DMF (data migration facility): off line, with data */ -# ifndef S_ISOFD -# define S_ISOFD(p) 0 -# endif - -/* Cray DMF (data migration facility): off line, with no data */ -# ifndef S_ISOFL -# define S_ISOFL(p) 0 -# endif - -/* 4.4BSD whiteout */ -# ifndef S_ISWHT -# define S_ISWHT(m) 0 -# endif - -/* If any of the following are undefined, - define them to their de facto standard values. */ -# if !S_ISUID -# define S_ISUID 04000 -# endif -# if !S_ISGID -# define S_ISGID 02000 -# endif - -/* S_ISVTX is a common extension to POSIX. */ -# ifndef S_ISVTX -# define S_ISVTX 01000 -# endif - -# if !S_IRUSR && S_IREAD -# define S_IRUSR S_IREAD -# endif -# if !S_IRUSR -# define S_IRUSR 00400 -# endif -# if !S_IRGRP -# define S_IRGRP (S_IRUSR >> 3) -# endif -# if !S_IROTH -# define S_IROTH (S_IRUSR >> 6) -# endif - -# if !S_IWUSR && S_IWRITE -# define S_IWUSR S_IWRITE -# endif -# if !S_IWUSR -# define S_IWUSR 00200 -# endif -# if !S_IWGRP -# define S_IWGRP (S_IWUSR >> 3) -# endif -# if !S_IWOTH -# define S_IWOTH (S_IWUSR >> 6) -# endif - -# if !S_IXUSR && S_IEXEC -# define S_IXUSR S_IEXEC -# endif -# if !S_IXUSR -# define S_IXUSR 00100 -# endif -# if !S_IXGRP -# define S_IXGRP (S_IXUSR >> 3) -# endif -# if !S_IXOTH -# define S_IXOTH (S_IXUSR >> 6) -# endif - -# if !S_IRWXU -# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) -# endif -# if !S_IRWXG -# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP) -# endif -# if !S_IRWXO -# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH) -# endif - -/* S_IXUGO is a common extension to POSIX. */ -# if !S_IXUGO -# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) -# endif - -# ifndef S_IRWXUGO -# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) -# endif - /* All the mode bits that can be affected by chmod. */ -# define CHMOD_MODE_BITS \ +#define CHMOD_MODE_BITS \ (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) - -#endif /* STAT_MACROS_H */ diff --git a/lib/stat_.h b/lib/stat_.h index f646dbb82..cbf5ac00a 100644 --- a/lib/stat_.h +++ b/lib/stat_.h @@ -1,6 +1,5 @@ /* Provide a more complete sys/stat header file. Copyright (C) 2006 Free Software Foundation, Inc. - Written by Eric Blake. 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 @@ -16,6 +15,8 @@ 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 Eric Blake, Paul Eggert, and Jim Meyering. */ + #ifndef _gl_SYS_STAT_H #define _gl_SYS_STAT_H @@ -24,7 +25,231 @@ needed by an application. Start with what the system provides. */ #include @ABSOLUTE_SYS_STAT_H@ -#include "stat-macros.h" +#ifndef S_IFMT +# define S_IFMT 0170000 +#endif + +#if STAT_MACROS_BROKEN +# undef S_ISBLK +# undef S_ISCHR +# undef S_ISDIR +# undef S_ISFIFO +# undef S_ISLNK +# undef S_ISNAM +# undef S_ISMPB +# undef S_ISMPC +# undef S_ISNWK +# undef S_ISREG +# undef S_ISSOCK +#endif + +#ifndef S_ISBLK +# ifdef S_IFBLK +# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) +# else +# define S_ISBLK(m) 0 +# endif +#endif + +#ifndef S_ISCHR +# ifdef S_IFCHR +# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) +# else +# define S_ISCHR(m) 0 +# endif +#endif + +#ifndef S_ISDIR +# ifdef S_IFDIR +# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +# else +# define S_ISDIR(m) 0 +# endif +#endif + +#ifndef S_ISDOOR /* Solaris 2.5 and up */ +# define S_ISDOOR(m) 0 +#endif + +#ifndef S_ISFIFO +# ifdef S_IFIFO +# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +# else +# define S_ISFIFO(m) 0 +# endif +#endif + +#ifndef S_ISLNK +# ifdef S_IFLNK +# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) +# else +# define S_ISLNK(m) 0 +# endif +#endif + +#ifndef S_ISMPB /* V7 */ +# ifdef S_IFMPB +# define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) +# define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) +# else +# define S_ISMPB(m) 0 +# define S_ISMPC(m) 0 +# endif +#endif + +#ifndef S_ISNAM /* Xenix */ +# ifdef S_IFNAM +# define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM) +# else +# define S_ISNAM(m) 0 +# endif +#endif + +#ifndef S_ISNWK /* HP/UX */ +# ifdef S_IFNWK +# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) +# else +# define S_ISNWK(m) 0 +# endif +#endif + +#ifndef S_ISPORT /* Solaris 10 and up */ +# define S_ISPORT(m) 0 +#endif + +#ifndef S_ISREG +# ifdef S_IFREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +# else +# define S_ISREG(m) 0 +# endif +#endif + +#ifndef S_ISSOCK +# ifdef S_IFSOCK +# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) +# else +# define S_ISSOCK(m) 0 +# endif +#endif + + +#ifndef S_TYPEISMQ +# define S_TYPEISMQ(p) 0 +#endif + +#ifndef S_TYPEISTMO +# define S_TYPEISTMO(p) 0 +#endif + + +#ifndef S_TYPEISSEM +# ifdef S_INSEM +# define S_TYPEISSEM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSEM) +# else +# define S_TYPEISSEM(p) 0 +# endif +#endif + +#ifndef S_TYPEISSHM +# ifdef S_INSHD +# define S_TYPEISSHM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSHD) +# else +# define S_TYPEISSHM(p) 0 +# endif +#endif + +/* high performance ("contiguous data") */ +#ifndef S_ISCTG +# define S_ISCTG(p) 0 +#endif + +/* Cray DMF (data migration facility): off line, with data */ +#ifndef S_ISOFD +# define S_ISOFD(p) 0 +#endif + +/* Cray DMF (data migration facility): off line, with no data */ +#ifndef S_ISOFL +# define S_ISOFL(p) 0 +#endif + +/* 4.4BSD whiteout */ +#ifndef S_ISWHT +# define S_ISWHT(m) 0 +#endif + +/* If any of the following are undefined, + define them to their de facto standard values. */ +#if !S_ISUID +# define S_ISUID 04000 +#endif +#if !S_ISGID +# define S_ISGID 02000 +#endif + +/* S_ISVTX is a common extension to POSIX. */ +#ifndef S_ISVTX +# define S_ISVTX 01000 +#endif + +#if !S_IRUSR && S_IREAD +# define S_IRUSR S_IREAD +#endif +#if !S_IRUSR +# define S_IRUSR 00400 +#endif +#if !S_IRGRP +# define S_IRGRP (S_IRUSR >> 3) +#endif +#if !S_IROTH +# define S_IROTH (S_IRUSR >> 6) +#endif + +#if !S_IWUSR && S_IWRITE +# define S_IWUSR S_IWRITE +#endif +#if !S_IWUSR +# define S_IWUSR 00200 +#endif +#if !S_IWGRP +# define S_IWGRP (S_IWUSR >> 3) +#endif +#if !S_IWOTH +# define S_IWOTH (S_IWUSR >> 6) +#endif + +#if !S_IXUSR && S_IEXEC +# define S_IXUSR S_IEXEC +#endif +#if !S_IXUSR +# define S_IXUSR 00100 +#endif +#if !S_IXGRP +# define S_IXGRP (S_IXUSR >> 3) +#endif +#if !S_IXOTH +# define S_IXOTH (S_IXUSR >> 6) +#endif + +#if !S_IRWXU +# define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) +#endif +#if !S_IRWXG +# define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP) +#endif +#if !S_IRWXO +# define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH) +#endif + +/* S_IXUGO is a common extension to POSIX. */ +#if !S_IXUGO +# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) +#endif + +#ifndef S_IRWXUGO +# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) +#endif /* mingw does not support symlinks, therefore it does not have lstat. But without links, stat does just fine. */ diff --git a/m4/lchown.m4 b/m4/lchown.m4 index f64dd0820..a7b357297 100644 --- a/m4/lchown.m4 +++ b/m4/lchown.m4 @@ -1,4 +1,4 @@ -#serial 10 +#serial 11 dnl Copyright (C) 1998, 2001, 2003, 2004, 2005, 2006 Free Software dnl Foundation, Inc. @@ -14,7 +14,6 @@ AC_DEFUN([gl_FUNC_LCHOWN], [ AC_REQUIRE([AC_TYPE_UID_T]) AC_REQUIRE([gl_FUNC_CHOWN]) - AC_REQUIRE([gl_STAT_MACROS]) AC_CHECK_DECLS_ONCE([lchown]) AC_REPLACE_FUNCS(lchown) ]) diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index bf9bb9544..9ca13116b 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 3 -*- Autoconf -*- +# sys_stat_h.m4 serial 4 -*- Autoconf -*- dnl Copyright (C) 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,22 +15,18 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], dnl Check for mkdir. Mingw has _mkdir(name) in the nonstandard dnl instead. - AC_CHECK_DECLS([mkdir], [], [], [#include ]) + AC_CHECK_DECLS([mkdir], + [], + [AC_CHECK_HEADERS([io.h])], + [#include ]) + AC_REQUIRE([AC_C_INLINE]) dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) - SYS_STAT_H= - if test $ac_cv_func_lstat:$ac_cv_have_decl_mkdir:$ac_cv_header_stat_broken \ - != yes:yes:no ; then - gl_ABSOLUTE_HEADER([sys/stat.h]) - ABSOLUTE_SYS_STAT_H=\"$gl_cv_absolute_sys_stat_h\" - AC_CHECK_HEADERS([io.h]) - AC_REQUIRE([AC_C_INLINE]) - SYS_STAT_H='sys/stat.h' - else - ABSOLUTE_SYS_STAT_H=\"no/such/file/sys/stat.h\" - fi + gl_ABSOLUTE_HEADER([sys/stat.h]) + ABSOLUTE_SYS_STAT_H=\"$gl_cv_absolute_sys_stat_h\" AC_SUBST([ABSOLUTE_SYS_STAT_H]) + SYS_STAT_H='sys/stat.h' AC_SUBST([SYS_STAT_H]) ]) # gl_HEADER_SYS_STAT_H diff --git a/modules/canonicalize b/modules/canonicalize index 3a10f4db0..9f1bd2191 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -10,7 +10,7 @@ m4/canonicalize.m4 Depends-on: cycle-check filenamecat -stat-macros +sys_stat xalloc xgetcwd xreadlink diff --git a/modules/chown b/modules/chown index 2a970076e..23eb3ac46 100644 --- a/modules/chown +++ b/modules/chown @@ -7,7 +7,7 @@ lib/fchown-stub.c m4/chown.m4 Depends-on: -stat-macros +sys_stat configure.ac: gl_FUNC_CHOWN diff --git a/modules/euidaccess b/modules/euidaccess index 1aecdd6ec..965b719a0 100644 --- a/modules/euidaccess +++ b/modules/euidaccess @@ -8,7 +8,7 @@ m4/euidaccess.m4 Depends-on: group-member -stat-macros +sys_stat configure.ac: gl_FUNC_EUIDACCESS diff --git a/modules/file-type b/modules/file-type index 9dc1763de..806c60d3a 100644 --- a/modules/file-type +++ b/modules/file-type @@ -8,7 +8,7 @@ m4/file-type.m4 Depends-on: gettext-h -stat-macros +sys_stat configure.ac: gl_FILE_TYPE diff --git a/modules/filemode b/modules/filemode index 02cd1215b..c09120c09 100644 --- a/modules/filemode +++ b/modules/filemode @@ -9,7 +9,7 @@ m4/filemode.m4 m4/st_dm_mode.m4 Depends-on: -stat-macros +sys_stat configure.ac: gl_FILEMODE diff --git a/modules/glob b/modules/glob index 9fc83e7fb..b4614bde3 100644 --- a/modules/glob +++ b/modules/glob @@ -15,9 +15,9 @@ extensions fnmatch getlogin_r mempcpy -stat-macros stdbool strdup +sys_stat unistd configure.ac: diff --git a/modules/isapipe b/modules/isapipe index 927255cf3..6352af451 100644 --- a/modules/isapipe +++ b/modules/isapipe @@ -7,8 +7,8 @@ lib/isapipe.h m4/isapipe.m4 Depends-on: -stat-macros stdbool +sys_stat unistd configure.ac: diff --git a/modules/lchown b/modules/lchown index 81d488a2b..3607c079c 100644 --- a/modules/lchown +++ b/modules/lchown @@ -8,7 +8,7 @@ m4/lchown.m4 Depends-on: chown -stat-macros +sys_stat configure.ac: gl_FUNC_LCHOWN diff --git a/modules/lstat b/modules/lstat index 6b72505c6..f2055f916 100644 --- a/modules/lstat +++ b/modules/lstat @@ -7,7 +7,7 @@ lib/lstat.h m4/lstat.m4 Depends-on: -stat-macros +sys_stat configure.ac: gl_FUNC_LSTAT diff --git a/modules/mkancesdirs b/modules/mkancesdirs index 22a6cc675..5bb1ea7be 100644 --- a/modules/mkancesdirs +++ b/modules/mkancesdirs @@ -11,6 +11,7 @@ dirname fcntl savewd stat-macros +sys_stat configure.ac: gl_MKANCESDIRS diff --git a/modules/mkdir-p b/modules/mkdir-p index f17ead01f..31e873c36 100644 --- a/modules/mkdir-p +++ b/modules/mkdir-p @@ -19,6 +19,7 @@ quote savewd stat-macros stdbool +sys_stat configure.ac: gl_MKDIR_PARENTS diff --git a/modules/modechange b/modules/modechange index 4c3397c01..abb55f502 100644 --- a/modules/modechange +++ b/modules/modechange @@ -9,6 +9,7 @@ m4/modechange.m4 Depends-on: stat-macros +sys_stat xalloc configure.ac: diff --git a/modules/rmdir b/modules/rmdir index a67be2b69..0367381fd 100644 --- a/modules/rmdir +++ b/modules/rmdir @@ -6,7 +6,7 @@ lib/rmdir.c m4/rmdir.m4 Depends-on: -stat-macros +sys_stat configure.ac: gl_FUNC_RMDIR diff --git a/modules/stat-macros b/modules/stat-macros index 5132c2537..d9a331c62 100644 --- a/modules/stat-macros +++ b/modules/stat-macros @@ -3,12 +3,10 @@ stat-related macros Files: lib/stat-macros.h -m4/stat-macros.m4 Depends-on: configure.ac: -gl_STAT_MACROS Makefile.am: diff --git a/modules/sys_stat b/modules/sys_stat index 9dbb90093..3b8839f91 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -7,7 +7,6 @@ m4/absolute-header.m4 m4/sys_stat_h.m4 Depends-on: -stat-macros configure.ac: gl_HEADER_SYS_STAT_H -- 2.11.0