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

* ntdll.h (STATUS_NOT_FOUND): Define. 

* ntea.cc (read_ea): Return correct ENOTSUP rather than EOPNOTSUPP.
	Handle STATUS_INVALID_DEVICE_REQUEST and STATUS_NOT_FOUND.  Explain
	why.  Convert conditional to switch statement.
	(write_ea): Return correct ENOTSUP rather than EOPNOTSUPP.  Handle
	STATUS_INVALID_DEVICE_REQUEST.  Convert conditional to switch statement.
This commit is contained in:
Corinna Vinschen 2011-08-09 09:14:28 +00:00
parent 4ae8b410a3
commit c29da54058
3 changed files with 62 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2011-08-09 Corinna Vinschen <corinna@vinschen.de>
* ntdll.h (STATUS_NOT_FOUND): Define.
* ntea.cc (read_ea): Return correct ENOTSUP rather than EOPNOTSUPP.
Handle STATUS_INVALID_DEVICE_REQUEST and STATUS_NOT_FOUND. Explain
why. Convert conditional to switch statement.
(write_ea): Return correct ENOTSUP rather than EOPNOTSUPP. Handle
STATUS_INVALID_DEVICE_REQUEST. Convert conditional to switch statement.
2011-08-07 Corinna Vinschen <corinna@vinschen.de> 2011-08-07 Corinna Vinschen <corinna@vinschen.de>
* resource.cc (getrlimit): Just return RLIM_INFINITY in a request for * resource.cc (getrlimit): Just return RLIM_INFINITY in a request for

1
winsup/cygwin/ntdll.h
View File

@ -56,6 +56,7 @@
#define STATUS_INVALID_LEVEL ((NTSTATUS) 0xc0000148) #define STATUS_INVALID_LEVEL ((NTSTATUS) 0xc0000148)
#define STATUS_DLL_NOT_FOUND ((NTSTATUS) 0xc0000135) #define STATUS_DLL_NOT_FOUND ((NTSTATUS) 0xc0000135)
#define STATUS_ENTRYPOINT_NOT_FOUND ((NTSTATUS) 0xc0000139) #define STATUS_ENTRYPOINT_NOT_FOUND ((NTSTATUS) 0xc0000139)
#define STATUS_NOT_FOUND ((NTSTATUS) 0xc0000225)
#define STATUS_BAD_DLL_ENTRYPOINT ((NTSTATUS) 0xc0000251) #define STATUS_BAD_DLL_ENTRYPOINT ((NTSTATUS) 0xc0000251)
#define STATUS_ILLEGAL_DLL_RELOCATION ((NTSTATUS) 0xc0000269) #define STATUS_ILLEGAL_DLL_RELOCATION ((NTSTATUS) 0xc0000269)
/* custom status code: */ /* custom status code: */

77
winsup/cygwin/ntea.cc
View File

@ -1,6 +1,6 @@
/* ntea.cc: code for manipulating Extended Attributes /* ntea.cc: code for manipulating Extended Attributes
Copyright 1997, 1998, 2000, 2001, 2006, 2008, 2009, 2010 Red Hat, Inc. Copyright 1997, 1998, 2000, 2001, 2006, 2008, 2009, 2010, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -78,12 +78,12 @@ read_ea (HANDLE hdl, path_conv &pc, const char *name, char *value, size_t size)
size_t nlen; size_t nlen;
/* For compatibility with Linux, we only allow user xattrs and /* For compatibility with Linux, we only allow user xattrs and
return EOPNOTSUPP otherwise. */ return ENOTSUP otherwise. */
if (ascii_strncasematch (name, "user.", 5)) if (ascii_strncasematch (name, "user.", 5))
name += 5; name += 5;
else else
{ {
set_errno (EOPNOTSUPP); set_errno (ENOTSUP);
goto out; goto out;
} }
@ -117,14 +117,32 @@ read_ea (HANDLE hdl, path_conv &pc, const char *name, char *value, size_t size)
} }
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
if (status == STATUS_NO_EAS_ON_FILE) switch (status)
ret = 0; {
else if (status == STATUS_NONEXISTENT_EA_ENTRY) case STATUS_NO_EAS_ON_FILE:
/* Actually this error code is either never generated, or it was only ret = 0;
generated in some old and long forgotton NT version. See below. */ break;
set_errno (ENOATTR); case STATUS_INVALID_DEVICE_REQUEST:
else set_errno (ENOTSUP);
__seterrno_from_nt_status (status); break;
case STATUS_NOT_FOUND:
/* STATUS_NOT_FOUND is returned when calling NtQueryEaFile on NFS.
In theory this should mean that the file just has no EAs, but in
fact NFS doesn't support EAs, other than the EAs which are used
for NFS requests. We're playing safe and convert STATUS_NOT_FOUND
to ENOATTR, unless we're on NFS, where we convert it to ENOTSUP. */
set_errno (pc.fs_is_nfs () ? ENOTSUP : ENOATTR);
break;
case STATUS_NONEXISTENT_EA_ENTRY:
/* Actually STATUS_NONEXISTENT_EA_ENTRY is either never generated, or
it was only generated in some old and long forgotton NT version.
See below. For safty reasons, we handle it here, nevertheless. */
set_errno (ENOATTR);
break;
default:
__seterrno_from_nt_status (status);
break;
}
goto out; goto out;
} }
if (name) if (name)
@ -235,10 +253,10 @@ write_ea (HANDLE hdl, path_conv &pc, const char *name, const char *value,
} }
/* For compatibility with Linux, we only allow user xattrs and /* For compatibility with Linux, we only allow user xattrs and
return EOPNOTSUPP otherwise. */ return ENOTSUP otherwise. */
if (!ascii_strncasematch (name, "user.", 5)) if (!ascii_strncasematch (name, "user.", 5))
{ {
set_errno (EOPNOTSUPP); set_errno (ENOTSUP);
goto out; goto out;
} }
@ -298,18 +316,27 @@ write_ea (HANDLE hdl, path_conv &pc, const char *name, const char *value,
} }
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
/* STATUS_EA_TOO_LARGE has a matching Win32 error ERROR_EA_TABLE_FULL. switch (status)
Too bad RtlNtStatusToDosError does not translate STATUS_EA_TOO_LARGE {
to ERROR_EA_TABLE_FULL, but to ERROR_EA_LIST_INCONSISTENT. This case STATUS_EA_TOO_LARGE:
error code is also returned for STATUS_EA_LIST_INCONSISTENT, which /* STATUS_EA_TOO_LARGE has a matching Win32 error ERROR_EA_TABLE_FULL.
means the incoming EA list is... inconsistent. For obvious reasons For some unknown reason RtlNtStatusToDosError does not translate
we translate ERROR_EA_LIST_INCONSISTENT to EINVAL, so we have to STATUS_EA_TOO_LARGE to ERROR_EA_TABLE_FULL, but instead to
handle STATUS_EA_TOO_LARGE explicitely here, to get the correct ERROR_EA_LIST_INCONSISTENT. This error code is also returned for
mapping to ENOSPC. */ STATUS_EA_LIST_INCONSISTENT, which means the incoming EA list is...
if (status == STATUS_EA_TOO_LARGE) inconsistent. For obvious reasons we translate
set_errno (ENOSPC); ERROR_EA_LIST_INCONSISTENT to EINVAL, so we have to handle
else STATUS_EA_TOO_LARGE explicitely here, to get the correct mapping
__seterrno_from_nt_status (status); to ENOSPC. */
set_errno (ENOSPC);
break;
case STATUS_INVALID_DEVICE_REQUEST:
set_errno (ENOTSUP);
break;
default:
__seterrno_from_nt_status (status);
break;
}
} }
else else
ret = 0; ret = 0;