reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected handling of proto==NULL in WINSOCK_getservbyname and

Browse Source 
WINSOCK_getservbyport.
This commit is contained in:
Lars Heete 2000-03-19 12:40:53 +00:00 committed by Alexandre Julliard
parent 1dac57f05f
commit e63fdf10f2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/winsock/socket.c
View File

@ -1996,17 +1996,20 @@ struct WIN_servent* __ws_getservbyname(const char *name, const char *proto, int
struct servent* serv; struct servent* serv;
int i = wsi_strtolo( pwsi, name, proto ); int i = wsi_strtolo( pwsi, name, proto );
if( i ) if( i ) {
if( (serv = getservbyname(pwsi->buffer, pwsi->buffer + i)) != NULL ) serv = getservbyname(pwsi->buffer,
proto ? (pwsi->buffer + i) : NULL);
if( serv != NULL )
if( WS_dup_se(pwsi, serv, dup_flag) ) if( WS_dup_se(pwsi, serv, dup_flag) )
return (struct WIN_servent*)(pwsi->se); return (struct WIN_servent*)(pwsi->se);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
else { else {
MESSAGE("service %s protocol %s not found; maybe you have add " MESSAGE("service %s protocol %s not found; maybe you have add "
"this to /etc/services\n", debugstr_a(pwsi->buffer), "this to /etc/services\n", debugstr_a(pwsi->buffer),
debugstr_a(pwsi->buffer+i)); proto ? debugstr_a(pwsi->buffer+i):"*");
SetLastError(WSANO_DATA); SetLastError(WSANO_DATA);
} }
}
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
} else SetLastError(WSANOTINITIALISED); } else SetLastError(WSANOTINITIALISED);
return NULL; return NULL;
@ -2039,19 +2042,19 @@ static struct WIN_servent* __ws_getservbyport(int port, const char* proto, int d
if( pwsi ) if( pwsi )
{ {
struct servent* serv; struct servent* serv;
int i = wsi_strtolo( pwsi, proto, NULL ); if (!proto || wsi_strtolo( pwsi, proto, NULL )) {
if( (serv = getservbyport(port, (proto) ? pwsi->buffer : NULL)) != NULL ) {
if( i )
if( (serv = getservbyport(port, pwsi->buffer)) != NULL )
if( WS_dup_se(pwsi, serv, dup_flag) ) if( WS_dup_se(pwsi, serv, dup_flag) )
return (struct WIN_servent*)(pwsi->se); return (struct WIN_servent*)(pwsi->se);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
}
else { else {
MESSAGE("service on port %d protocol %s not found; maybe you have " MESSAGE("service on port %d protocol %s not found; maybe you have "
"add this to /etc/services\n", ntohl(port), "add this to /etc/services\n", ntohl(port),
debugstr_a(pwsi->buffer)); proto ? debugstr_a(pwsi->buffer) : "*");
SetLastError(WSANO_DATA); SetLastError(WSANO_DATA);
} }
}
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
} else SetLastError(WSANOTINITIALISED); } else SetLastError(WSANOTINITIALISED);
return NULL; return NULL;