nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge from trunk up to r8020.

Browse Source 
[originally from svn r8021]
[r8020 == 14d825d42f]
This commit is contained in:
Simon Tatham
2008-05-28 19:28:17 +00:00
parent cb18f9a6eb 14d825d42f
commit 85c227326c
8 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
unix/uxnet.c
View File

@ -1292,15 +1292,29 @@ int net_service_lookup(char *service)
return 0;
}
SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname)
SockAddr platform_get_x11_unix_address(const char *display, int displaynum,
char **canonicalname)
{
SockAddr ret = snew(struct SockAddr_tag);
int n;
memset(ret, 0, sizeof *ret);
ret->family = AF_UNIX;
n = snprintf(ret->hostname, sizeof ret->hostname,
"%s%d", X11_UNIX_PATH, displaynum);
/*
* Mac OS X Leopard uses an innovative X display naming
* convention in which the entire display name is the path to
* the Unix socket, including the trailing :0 which only
* _looks_ like a display number. Heuristically, I think
* detecting this by means of a leading slash ought to be
* adequate.
*/
if (display[0] == '/') {
n = snprintf(ret->hostname, sizeof ret->hostname,
"%s", display);
} else {
n = snprintf(ret->hostname, sizeof ret->hostname,
"%s%d", X11_UNIX_PATH, displaynum);
}
if(n < 0)
ret->error = "snprintf failed";
else if(n >= sizeof ret->hostname)