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

Cygwin: drop CYGWIN_SOCKET_UUID, define CYGWIN_SOCKET_GUID as GUID pointer 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2018-03-02 18:07:39 +01:00
parent d87ef0dac9
commit 1949db7829
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -34,6 +34,14 @@ static int __unused
get_inet_addr_unix (const struct sockaddr *in, int inlen, get_inet_addr_unix (const struct sockaddr *in, int inlen,
struct sockaddr_storage *out, int *outlen, struct sockaddr_storage *out, int *outlen,
int *type = NULL) int *type = NULL)
GUID __cygwin_socket_guid = {
.Data1 = 0xefc1714d,
.Data2 = 0x7b19,
.Data3 = 0x4407,
.Data4 = { 0xba, 0xb3, 0xc5, 0xb1, 0xf9, 0x2c, 0xb8, 0x8c }
};
HANDLE
{ {
/* Check for abstract socket. */ /* Check for abstract socket. */
if (inlen >= (int) sizeof (in->sa_family) + 7 if (inlen >= (int) sizeof (in->sa_family) + 7

5
winsup/cygwin/ntdll.h
View File

@ -10,9 +10,10 @@
#include <w32api/ntstatus.h> #include <w32api/ntstatus.h>
/* Special values for Cygwin AF_UNIX socket reparse points. */ /* Values for Cygwin AF_UNIX socket reparse points. */
#define IO_REPARSE_TAG_CYGUNIX (0x00006375) #define IO_REPARSE_TAG_CYGUNIX (0x00006375)
#define CYGWIN_SOCKET_UUID L"efc1714d-7b19-4407-bab3-c5b1f92cb88c" extern GUID __cygwin_socket_guid;
#define CYGWIN_SOCKET_GUID (&__cygwin_socket_guid)
/* custom status code: */ /* custom status code: */
#define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269) #define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269)

5
winsup/cygwin/path.cc
View File

@ -65,7 +65,6 @@
#include "shared_info.h" #include "shared_info.h"
#include "tls_pbuf.h" #include "tls_pbuf.h"
#include "environ.h" #include "environ.h"
#include "uuid.h"
#undef basename #undef basename
suffix_info stat_suffixes[] = suffix_info stat_suffixes[] =
@ -2356,10 +2355,8 @@ check_reparse_point_target (HANDLE h, bool remote, PREPARSE_DATA_BUFFER rp,
else if (rp->ReparseTag == IO_REPARSE_TAG_CYGUNIX) else if (rp->ReparseTag == IO_REPARSE_TAG_CYGUNIX)
{ {
PREPARSE_GUID_DATA_BUFFER rgp = (PREPARSE_GUID_DATA_BUFFER) rp; PREPARSE_GUID_DATA_BUFFER rgp = (PREPARSE_GUID_DATA_BUFFER) rp;
UUID uuid;
uuid_from_string (CYGWIN_SOCKET_UUID, uuid); if (memcmp (CYGWIN_SOCKET_GUID, &rgp->ReparseGuid, sizeof (GUID)) == 0)
if (memcmp (&uuid, &rgp->ReparseGuid, sizeof (UUID)) == 0)
return PATH_SOCKET | PATH_REP; return PATH_SOCKET | PATH_REP;
} }
return 0; return 0;