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

* transport_pipes.cc (transport_layer_pipes::transport_layer_pipes):

Browse Source 
Always use cygwin_internal to fetch installation key.
This commit is contained in:
Corinna Vinschen 2012-02-14 14:12:11 +00:00
parent a8c8f19a43
commit ab9108200f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygserver/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-14 Corinna Vinschen <corinna@vinschen.de>
* transport_pipes.cc (transport_layer_pipes::transport_layer_pipes):
Always use cygwin_internal to fetch installation key.
2011-10-10 Corinna Vinschen <corinna@vinschen.de> 2011-10-10 Corinna Vinschen <corinna@vinschen.de>
* cygserver.cc (print_usage): Align output to utilities in utils * cygserver.cc (print_usage): Align output to utilities in utils

8
winsup/cygserver/transport_pipes.cc
View File

@ -1,6 +1,6 @@
/* transport_pipes.cc /* transport_pipes.cc
Copyright 2001, 2002, 2003, 2004, 2009 Red Hat Inc. Copyright 2001, 2002, 2003, 2004, 2009, 2012 Red Hat Inc.
Written by Robert Collins <rbtcollins@hotmail.com> Written by Robert Collins <rbtcollins@hotmail.com>
@ -84,17 +84,11 @@ transport_layer_pipes::transport_layer_pipes ()
_is_accepted_endpoint (false), _is_accepted_endpoint (false),
_is_listening_endpoint (false) _is_listening_endpoint (false)
{ {
#ifdef __INSIDE_CYGWIN__
extern WCHAR installation_key_buf[18];
wcpcpy (wcpcpy (wcpcpy (_pipe_name, PIPE_NAME_PREFIX), installation_key_buf),
PIPE_NAME_SUFFIX);
#else
wchar_t cyg_instkey[18]; wchar_t cyg_instkey[18];
wchar_t *p = wcpcpy (_pipe_name, PIPE_NAME_PREFIX); wchar_t *p = wcpcpy (_pipe_name, PIPE_NAME_PREFIX);
if (!cygwin_internal (CW_GET_INSTKEY, cyg_instkey)) if (!cygwin_internal (CW_GET_INSTKEY, cyg_instkey))
wcpcpy (wcpcpy (p, cyg_instkey), PIPE_NAME_SUFFIX); wcpcpy (wcpcpy (p, cyg_instkey), PIPE_NAME_SUFFIX);
#endif
} }
transport_layer_pipes::~transport_layer_pipes () transport_layer_pipes::~transport_layer_pipes ()