# HG changeset patch # User Jim Meyering # Date 832680927 0 # Node ID afb9225d620df1fc21e2f7327b9dc6f809351efb # Parent 9dd2b57abf37bdd9d9a6496dbc6b0df138b4aa77 (euidaccess) [!S_IROTH]: Define. [!S_IWOTH]: Define. [!S_IXOTH]: Define. Marcus Daniels reported that m68k NEXTSTEP 3.2 doesn't define S_IROTH or S_IWOTH unless some posix compile option is used and associated symbols defined. diff -r 9dd2b57abf37 -r afb9225d620d lib/euidaccess.c --- a/lib/euidaccess.c Tue May 21 03:40:45 1996 +0000 +++ b/lib/euidaccess.c Tue May 21 12:15:27 1996 +0000 @@ -22,44 +22,44 @@ Adapted for GNU C library by Roland McGrath. */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #include #ifdef S_IEXEC -#ifndef S_IXUSR -#define S_IXUSR S_IEXEC -#endif -#ifndef S_IXGRP -#define S_IXGRP (S_IEXEC >> 3) -#endif -#ifndef S_IXOTH -#define S_IXOTH (S_IEXEC >> 6) -#endif +# ifndef S_IXUSR +# define S_IXUSR S_IEXEC +# endif +# ifndef S_IXGRP +# define S_IXGRP (S_IEXEC >> 3) +# endif +# ifndef S_IXOTH +# define S_IXOTH (S_IEXEC >> 6) +# endif #endif /* S_IEXEC */ #if defined (HAVE_UNISTD_H) || defined (_LIBC) -#include +# include #endif #ifdef _POSIX_VERSION -#include -#if !defined(NGROUPS_MAX) || NGROUPS_MAX < 1 -#undef NGROUPS_MAX -#define NGROUPS_MAX sysconf (_SC_NGROUPS_MAX) -#endif /* NGROUPS_MAX */ +# include +# if !defined(NGROUPS_MAX) || NGROUPS_MAX < 1 +# undef NGROUPS_MAX +# define NGROUPS_MAX sysconf (_SC_NGROUPS_MAX) +# endif /* NGROUPS_MAX */ #else /* not _POSIX_VERSION */ uid_t getuid (); gid_t getgid (); uid_t geteuid (); gid_t getegid (); -#include -#if !defined(NGROUPS_MAX) && defined(NGROUPS) -#define NGROUPS_MAX NGROUPS -#endif /* not NGROUPS_MAX and NGROUPS */ +# include +# if !defined(NGROUPS_MAX) && defined(NGROUPS) +# define NGROUPS_MAX NGROUPS +# endif /* not NGROUPS_MAX and NGROUPS */ #endif /* not POSIX_VERSION */ #include @@ -68,20 +68,31 @@ #endif #if defined(EACCES) && !defined(EACCESS) -#define EACCESS EACCES +# define EACCESS EACCES #endif #ifndef F_OK -#define F_OK 0 -#define X_OK 1 -#define W_OK 2 -#define R_OK 4 +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 #endif +#if !defined (S_IROTH) && defined (R_OK) +# define S_IROTH R_OK +#endif + +#if !defined (S_IWOTH) && defined (W_OK) +# define S_IWOTH W_OK +#endif + +#if !defined (S_IXOTH) && defined (X_OK) +# define S_IXOTH X_OK +#endif #ifdef _LIBC -#define group_member __group_member +# define group_member __group_member #else @@ -100,11 +111,11 @@ /* Nonzero if UID, GID, EUID, and EGID have valid values. */ static int have_ids = 0; -#ifdef HAVE_GETGROUPS +# ifdef HAVE_GETGROUPS int group_member (); -#else -#define group_member(gid) 0 -#endif +# else +# define group_member(gid) 0 +# endif #endif