diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/cygwin/flock.cc | 19 | ||||
| -rw-r--r-- | winsup/cygwin/tmpbuf.h | 27 |
3 files changed, 46 insertions, 9 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b822077dd..6c96d684f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,14 @@ 2010-06-21 Christopher Faylor <me+cygwin@cgf.cx> + * tmpbuf.h: New file. + * flock.cc: Include tmpbuf.h for new tmpbuf functionality. + (allow_others_to_sync): Use tmpbuf rather than tmp_pathbuf. Explain + why. + (lf_setlock): For consistency, use tmpbuf rather than tmp_pathbuf. + (lf_getlock): Ditto. + +2010-06-21 Christopher Faylor <me+cygwin@cgf.cx> + * dcrt0.cc (__api_fatal): Temporarily generate a stackdump. 2010-06-21 Christopher Faylor <me+cygwin@cgf.cx> diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc index e31add840..dd8d7df58 100644 --- a/winsup/cygwin/flock.cc +++ b/winsup/cygwin/flock.cc @@ -105,7 +105,7 @@ #include "pinfo.h" #include "sigproc.h" #include "cygtls.h" -#include "tls_pbuf.h" +#include "tmpbuf.h" #include "ntdll.h" #include <sys/queue.h> #include <wchar.h> @@ -151,10 +151,11 @@ allow_others_to_sync () LPVOID ace; ULONG len; - /* Get this process DACL. We use a temporary path buffer in TLS space - to avoid having to alloc 64K from the stack. */ - tmp_pathbuf tp; - PSECURITY_DESCRIPTOR sd = (PSECURITY_DESCRIPTOR) tp.w_get (); + /* Get this process DACL. We use a temporary buffer to avoid having to + alloc 64K from the stack. Can't use tls functions at this point because + this gets called during initialization when the tls is not really + available. */ + tmpbuf sd; status = NtQuerySecurityObject (NtCurrentProcess (), DACL_SECURITY_INFORMATION, sd, NT_MAX_PATH * sizeof (WCHAR), &len); @@ -873,7 +874,7 @@ lf_setlock (lockf_t *lock, inode_t *node, lockf_t **clean, HANDLE fhdl) lockf_t **head = lock->lf_head; lockf_t **prev, *overlap; int ovcase, priority, old_prio, needtolink; - tmp_pathbuf tp; + tmpbuf tp; /* * Set the priority @@ -885,7 +886,7 @@ lf_setlock (lockf_t *lock, inode_t *node, lockf_t **clean, HANDLE fhdl) * Scan lock list for this file looking for locks that would block us. */ /* Create temporary space for the all locks list. */ - node->i_all_lf = (lockf_t *) tp.w_get (); + node->i_all_lf = (lockf_t *) (void *) tp; while ((block = lf_getblock(lock, node))) { DWORD ret; @@ -1227,10 +1228,10 @@ static int lf_getlock (lockf_t *lock, inode_t *node, struct __flock64 *fl) { lockf_t *block; - tmp_pathbuf tp; + tmpbuf tp; /* Create temporary space for the all locks list. */ - node->i_all_lf = (lockf_t *) tp.w_get (); + node->i_all_lf = (lockf_t *) (void * ) tp; if ((block = lf_getblock (lock, node))) { if (block->lf_obj) diff --git a/winsup/cygwin/tmpbuf.h b/winsup/cygwin/tmpbuf.h new file mode 100644 index 000000000..937d50f6a --- /dev/null +++ b/winsup/cygwin/tmpbuf.h @@ -0,0 +1,27 @@ +/* tmpbuf.h + + Copyright 2010 Red Hat, Inc. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +#ifndef _TMPBUF_H +#define _TMPBUF_H +class tmpbuf +{ + void *buf; +public: + tmpbuf (size_t size = NT_MAX_PATH) + { + buf = calloc (1, size); + if (!buf) + api_fatal ("allocation of temporary buffer failed"); + } + operator void * () {return buf;} + operator char * () {return (char *) buf;} + operator PSECURITY_DESCRIPTOR () {return (PSECURITY_DESCRIPTOR) buf;} + PSECURITY_DESCRIPTOR operator -> () {return (PSECURITY_DESCRIPTOR) buf;} + ~tmpbuf () {free (buf);} +}; +#endif /*_TMPBUF_H*/ |