drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* sec_acl.cc (acl_worker): Remove. 

(acl32): Implement acl_worker functionality here.
	(lacl32): Just return -1 with errno set to ENOSYS.
	(lacl): Ditto.
	* include/cygwin/acl.h (lacl): Remove this call.
This commit is contained in:
Corinna Vinschen 2010-09-12 19:43:55 +00:00
parent 11fef78748
commit f7382efe27
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2010-09-12 Corinna Vinschen <corinna@vinschen.de>
* sec_acl.cc (acl_worker): Remove.
(acl32): Implement acl_worker functionality here.
(lacl32): Just return -1 with errno set to ENOSYS.
(lacl): Ditto.
* include/cygwin/acl.h (lacl): Remove this call.
2010-09-12 Christopher Faylor <me+cygwin@cgf.cx> 2010-09-12 Christopher Faylor <me+cygwin@cgf.cx>
* sigproc.cc (sig_dispatch_pending): Remove debugging statement. * sigproc.cc (sig_dispatch_pending): Remove debugging statement.

3
winsup/cygwin/include/cygwin/acl.h
View File

@ -1,6 +1,6 @@
/* cygwin/acl.h header file for Cygwin. /* cygwin/acl.h header file for Cygwin.
Copyright 1999, 2000, 2001, 2002 Red Hat, Inc. Copyright 1999, 2000, 2001, 2002, 2010 Red Hat, Inc.
Written by C. Vinschen. Written by C. Vinschen.
This file is part of Cygwin. This file is part of Cygwin.
@ -80,7 +80,6 @@ typedef struct acl {
#ifndef __INSIDE_CYGWIN__ #ifndef __INSIDE_CYGWIN__
int _EXFUN(acl,(const char *path, int cmd, int nentries, aclent_t *aclbufp)); int _EXFUN(acl,(const char *path, int cmd, int nentries, aclent_t *aclbufp));
int _EXFUN(lacl,(const char *path, int cmd, int nentries, aclent_t *aclbufp));
int _EXFUN(facl,(int fd, int cmd, int nentries, aclent_t *aclbufp)); int _EXFUN(facl,(int fd, int cmd, int nentries, aclent_t *aclbufp));
int _EXFUN(aclcheck,(aclent_t *aclbufp, int nentries, int *which)); int _EXFUN(aclcheck,(aclent_t *aclbufp, int nentries, int *which));
int _EXFUN(aclsort,(int nentries, int calclass, aclent_t *aclbufp)); int _EXFUN(aclsort,(int nentries, int calclass, aclent_t *aclbufp));

22
winsup/cygwin/sec_acl.cc
View File

@ -416,12 +416,12 @@ getacl (HANDLE handle, path_conv &pc, int nentries, __aclent32_t *aclbufp)
return pos; return pos;
} }
static int extern "C" int
acl_worker (const char *path, int cmd, int nentries, __aclent32_t *aclbufp, acl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp)
unsigned fmode)
{ {
int res = -1; int res = -1;
fhandler_base *fh = build_fh_name (path, fmode | PC_KEEP_HANDLE,
fhandler_base *fh = build_fh_name (path, PC_SYM_FOLLOW | PC_KEEP_HANDLE,
stat_suffixes); stat_suffixes);
if (fh->error ()) if (fh->error ())
{ {
@ -438,16 +438,12 @@ acl_worker (const char *path, int cmd, int nentries, __aclent32_t *aclbufp,
return res; return res;
} }
extern "C" int
acl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp)
{
return acl_worker (path, cmd, nentries, aclbufp, PC_SYM_FOLLOW);
}
extern "C" int extern "C" int
lacl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp) lacl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp)
{ {
return acl_worker (path, cmd, nentries, aclbufp, PC_SYM_NOFOLLOW); /* This call was an accident. Make it absolutely clear. */
set_errno (ENOSYS);
return -1;
} }
extern "C" int extern "C" int
@ -935,7 +931,9 @@ facl (int fd, int cmd, int nentries, __aclent16_t *aclbufp)
extern "C" int extern "C" int
lacl (const char *path, int cmd, int nentries, __aclent16_t *aclbufp) lacl (const char *path, int cmd, int nentries, __aclent16_t *aclbufp)
{ {
return lacl32 (path, cmd, nentries, acl16to32 (aclbufp, nentries)); /* This call was an accident. Make it absolutely clear. */
set_errno (ENOSYS);
return -1;
} }
extern "C" int extern "C" int