projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
lib
/
euidaccess.c
diff --git
a/lib/euidaccess.c
b/lib/euidaccess.c
index
d63566c
..
17eb724
100644
(file)
--- a/
lib/euidaccess.c
+++ b/
lib/euidaccess.c
@@
-1,53
+1,38
@@
/* euidaccess -- check if effective user id can access file
/* euidaccess -- check if effective user id can access file
- Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004
Free
- Software Foundation, Inc.
+ Copyright (C) 1990, 1991, 1995, 1998, 2000, 2003, 2004
, 2005, 2006, 2008
+
Free
Software Foundation, Inc.
This file is part of the GNU C Library.
This file is part of the GNU C Library.
- 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
2, or (at your option)
- any later version.
+ 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.
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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 David MacKenzie and Torbjorn Granlund.
Adapted for GNU C library by Roland McGrath. */
/* Written by David MacKenzie and Torbjorn Granlund.
Adapted for GNU C library by Roland McGrath. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifndef _LIBC
#ifndef _LIBC
-# include
"euidaccess.h"
+# include
<config.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
-
-#if HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
+#include <unistd.h>
#if HAVE_LIBGEN_H
# include <libgen.h>
#endif
#if HAVE_LIBGEN_H
# include <libgen.h>
#endif
-#ifndef _POSIX_VERSION
-uid_t getuid ();
-gid_t getgid ();
-uid_t geteuid ();
-gid_t getegid ();
-#endif
-
#include <errno.h>
#ifndef __set_errno
# define __set_errno(val) errno = (val)
#include <errno.h>
#ifndef __set_errno
# define __set_errno(val) errno = (val)
@@
-80,25
+65,24
@@
gid_t getegid ();
#else
# include "group-member.h"
#else
# include "group-member.h"
-# include "stat-macros.h"
#endif
#endif
-/* Return 0 if the user has permission of type MODE on
file PATH
;
+/* Return 0 if the user has permission of type MODE on
FILE
;
otherwise, return -1 and set `errno'.
Like access, except that it uses the effective user and group
id's instead of the real ones, and it does not always check for read-only
file system, text busy, etc. */
int
otherwise, return -1 and set `errno'.
Like access, except that it uses the effective user and group
id's instead of the real ones, and it does not always check for read-only
file system, text busy, etc. */
int
-euidaccess (const char *
path
, int mode)
+euidaccess (const char *
file
, int mode)
{
#if defined EFF_ONLY_OK
{
#if defined EFF_ONLY_OK
- return access (
path
, mode | EFF_ONLY_OK);
+ return access (
file
, mode | EFF_ONLY_OK);
#elif defined ACC_SELF
#elif defined ACC_SELF
- return accessx (
path
, mode, ACC_SELF);
+ return accessx (
file
, mode, ACC_SELF);
#elif HAVE_EACCESS
#elif HAVE_EACCESS
- return eaccess (
path
, mode);
+ return eaccess (
file
, mode);
#else
uid_t uid = getuid ();
#else
uid_t uid = getuid ();
@@
-117,20
+101,20
@@
euidaccess (const char *path, int mode)
safe. */
if (mode == F_OK)
safe. */
if (mode == F_OK)
- return stat (
path
, &stats);
+ return stat (
file
, &stats);
else
{
int result;
int saved_errno;
else
{
int result;
int saved_errno;
-
+
if (uid != euid)
setreuid (euid, uid);
if (gid != egid)
setregid (egid, gid);
if (uid != euid)
setreuid (euid, uid);
if (gid != egid)
setregid (egid, gid);
- result = access (
path
, mode);
+ result = access (
file
, mode);
saved_errno = errno;
saved_errno = errno;
-
+
/* Restore them. */
if (uid != euid)
setreuid (uid, euid);
/* Restore them. */
if (uid != euid)
setreuid (uid, euid);
@@
-150,9
+134,9
@@
euidaccess (const char *path, int mode)
unsigned int granted;
if (uid == euid && gid == egid)
/* If we are not set-uid or set-gid, access does the same. */
unsigned int granted;
if (uid == euid && gid == egid)
/* If we are not set-uid or set-gid, access does the same. */
- return access (
path
, mode);
+ return access (
file
, mode);
- if (stat (
path, &stats)
)
+ if (stat (
file, &stats) != 0
)
return -1;
/* The super-user can read and write any file, and execute any file
return -1;
/* The super-user can read and write any file, and execute any file