JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.cc (fhandler_base::open): Set query access mode according

Browse Source 
to query_open setting.
	(fhandler_base::fhandler_base): Initialize query_open.
	* fhandler.h (FH_QUERYOPEN): Drop.
	(enum query_state): Add.
	(class fhandler_base): Add query_open member.
	(fhandler_base::get_query_open): Redefine to use query_open.
	(fhandler_base::set_query_open): Ditto.
	* fhandler_disk_file.cc (fhandler_base::fstat_fs): Remove O_DIROPEN
	from open_flags since it's added in open_fs anyway.  Remove
	query_open_already.  Use new query_open settings.  Rearrange slightly.
	(fhandler_base::fstat_helper): Add get_io_handle as parameter to
	get_file_attribute.
	* security.cc (get_nt_object_attribute): Make returning an int.
	Return -1 on error, 0 otherwise.
	(get_file_attribute): Take an object handle as argument. Move down
	to allow calling get_nt_object_attribute in case a non-NULL handle
	is given.
	* security.h (get_file_attribute): Add handle to argument list.
	* syscalls.cc (chown_worker): Accomodate new definition of
	get_file_attribute.
This commit is contained in:
Corinna Vinschen
2004-04-08 07:57:28 +00:00
parent 284a55c33e
commit a9a5b2eab0
7 changed files with 94 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/fhandler.h
View File

@@ -37,8 +37,6 @@ enum
FH_ISREMOTE = 0x10000000, /* File is on a remote drive */
FH_DCEXEC = 0x20000000, /* Don't care if this is executable */
FH_HASACLS = 0x40000000, /* True if fs of file has ACLS */
FH_QUERYOPEN = 0x80000000, /* open file without requesting either read
or write access */
};
#define FHDEVN(n) (n)
@@ -95,12 +93,19 @@ enum bg_check_types
bg_signalled = 2
};
enum query_state {
no_query = 0,
query_read_control = 1,
query_null_access = 2
};
class fhandler_base
{
friend class dtable;
friend void close_all_files ();
protected:
DWORD status;
unsigned query_open : 2;
private:
int access;
HANDLE io_handle;
@@ -239,8 +244,8 @@ class fhandler_base
bool get_fs_flags (DWORD flagval = UINT32_MAX)
{ return (fs_flags & (flagval)); }
bool get_query_open () { return FHISSETF (QUERYOPEN); }
void set_query_open (bool val) { FHCONDSETF (val, QUERYOPEN); }
query_state get_query_open () { return (query_state) query_open; }
void set_query_open (query_state val) { query_open = val; }
bool get_readahead_valid () { return raixget < ralen; }
int puts_readahead (const char *s, size_t len = (size_t) -1);