libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fhandler_socket.cc (secret_event_name): Return void. Use incoming 

char *parameter instead of local static buffer.
	(fhandler_socket::create_secret_event): Accomodate new calling
	convention for secret_event_name.
	(fhandler_socket::close_secret_event): Ditto.
This commit is contained in:
Corinna Vinschen 2003-05-20 17:39:46 +00:00
parent d4f3ce316c
commit 44be819760
2 changed files with 16 additions and 9 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 @@
2003-05-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (secret_event_name): Return void. Use incoming
char *parameter instead of local static buffer.
(fhandler_socket::create_secret_event): Accomodate new calling
convention for secret_event_name.
(fhandler_socket::close_secret_event): Ditto.
2003-05-20 Corinna Vinschen <corinna@vinschen.de> 2003-05-20 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (SECRET_EVENT_NAME): Remove. * fhandler_socket.cc (SECRET_EVENT_NAME): Remove.

17
winsup/cygwin/fhandler_socket.cc
View File

@ -43,17 +43,14 @@ int sscanf (const char *, const char *, ...);
fhandler_dev_random* entropy_source; fhandler_dev_random* entropy_source;
static char * static void
secret_event_name (short port, int *secret_ptr) secret_event_name (char *buf, short port, int *secret_ptr)
{ {
static NO_COPY char buf[MAX_PATH] = {0};
__small_sprintf (buf, "%scygwin.local_socket.secret.%d.%08x-%08x-%08x-%08x", __small_sprintf (buf, "%scygwin.local_socket.secret.%d.%08x-%08x-%08x-%08x",
wincap.has_terminal_services () ? "Global\\" : "", wincap.has_terminal_services () ? "Global\\" : "",
port, port,
secret_ptr [0], secret_ptr [1], secret_ptr [0], secret_ptr [1],
secret_ptr [2], secret_ptr [3]); secret_ptr [2], secret_ptr [3]);
return buf;
} }
/* cygwin internal: map sockaddr into internet domain address */ /* cygwin internal: map sockaddr into internet domain address */
@ -251,8 +248,8 @@ fhandler_socket::create_secret_event (int* secret)
return NULL; return NULL;
} }
char *event_name = secret_event_name (sin.sin_port, char event_name[MAX_PATH];
secret ?: connect_secret); secret_event_name (event_name, sin.sin_port, secret ?: connect_secret);
LPSECURITY_ATTRIBUTES sec = get_inheritance (true); LPSECURITY_ATTRIBUTES sec = get_inheritance (true);
secret_event = CreateEvent (sec, FALSE, FALSE, event_name); secret_event = CreateEvent (sec, FALSE, FALSE, event_name);
if (!secret_event && GetLastError () == ERROR_ALREADY_EXISTS) if (!secret_event && GetLastError () == ERROR_ALREADY_EXISTS)
@ -291,8 +288,10 @@ fhandler_socket::close_secret_event ()
int int
fhandler_socket::check_peer_secret_event (struct sockaddr_in* peer, int* secret) fhandler_socket::check_peer_secret_event (struct sockaddr_in* peer, int* secret)
{ {
char *event_name = secret_event_name (peer->sin_port,
secret ?: connect_secret); char event_name[MAX_PATH];
secret_event_name (event_name, peer->sin_port, secret ?: connect_secret);
HANDLE ev = CreateEvent (&sec_all_nih, FALSE, FALSE, event_name); HANDLE ev = CreateEvent (&sec_all_nih, FALSE, FALSE, event_name);
if (!ev && GetLastError () == ERROR_ALREADY_EXISTS) if (!ev && GetLastError () == ERROR_ALREADY_EXISTS)
{ {