qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* sysdeps/posix/getaddrinfo.c: Correct modifications done for
	PR1515.  Patch by Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp>.
This commit is contained in:
Ulrich Drepper 2000-01-18 09:56:22 +00:00
parent 9281f45d10
commit 3a47453d29
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-01-18 Ulrich Drepper <drepper@cygnus.com> 2000-01-18 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/getaddrinfo.c: Correct modifications done for
PR1515. Patch by Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp>.
* posix/regex.h (RE_SYNTAX_POSIX_EXTENDED): Add RE_CONTEXT_INVALID_OPS. * posix/regex.h (RE_SYNTAX_POSIX_EXTENDED): Add RE_CONTEXT_INVALID_OPS.
* posix/regex.c (regex_compile): Return appropriate errors for * posix/regex.c (regex_compile): Return appropriate errors for
unterminated brace expressions. Detect invalid characters unterminated brace expressions. Detect invalid characters

24
sysdeps/posix/getaddrinfo.c
View File

@ -100,8 +100,8 @@ struct gaih_typeproto
static struct gaih_typeproto gaih_inet_typeproto[] = static struct gaih_typeproto gaih_inet_typeproto[] =
{ {
{ 0, 0, NULL }, { 0, 0, NULL, 0 },
{ SOCK_STREAM, IPPROTO_TCP, (char *) "tcp" ,0 }, { SOCK_STREAM, IPPROTO_TCP, (char *) "tcp", 0 },
{ SOCK_DGRAM, IPPROTO_UDP, (char *) "udp", 0 }, { SOCK_DGRAM, IPPROTO_UDP, (char *) "udp", 0 },
{ SOCK_RAW, IPPROTO_RAW, (char *) "raw", GAI_PROTO_NOSERVICE }, { SOCK_RAW, IPPROTO_RAW, (char *) "raw", GAI_PROTO_NOSERVICE },
{ 0, 0, NULL, 0 } { 0, 0, NULL, 0 }
@ -145,10 +145,10 @@ gaih_local (const char *name, const struct gaih_service *service,
struct gaih_typeproto *tp = gaih_inet_typeproto + 1; struct gaih_typeproto *tp = gaih_inet_typeproto + 1;
while (tp->name != NULL while (tp->name != NULL
&& (req->ai_socktype != tp->socktype || req->ai_socktype == 0)
&& ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0 && ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0
|| req->ai_protocol != tp->protocol || (req->ai_socktype != 0 && req->ai_socktype != tp->socktype)
|| req->ai_protocol == 0)) || (req->ai_protocol != 0
&& req->ai_protocol != tp->protocol)))
++tp; ++tp;
if (tp->name == NULL) if (tp->name == NULL)
@ -299,10 +299,9 @@ gaih_inet (const char *name, const struct gaih_service *service,
++tp; ++tp;
while (tp->name != NULL while (tp->name != NULL
&& (req->ai_socktype != tp->socktype || req->ai_socktype == 0) && ((req->ai_socktype != 0 && req->ai_socktype != tp->socktype)
&& ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0 || (req->ai_protocol != 0
|| req->ai_protocol != tp->protocol && req->ai_protocol != tp->protocol)))
|| req->ai_protocol == 0))
++tp; ++tp;
if (tp->name == NULL) if (tp->name == NULL)
@ -334,7 +333,12 @@ gaih_inet (const char *name, const struct gaih_service *service,
struct gaih_servtuple **pst = &st; struct gaih_servtuple **pst = &st;
for (tp++; tp->name; tp++) for (tp++; tp->name; tp++)
{ {
struct gaih_servtuple *newp = (struct gaih_servtuple *) struct gaih_servtuple *newp;
if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
continue;
newp = (struct gaih_servtuple *)
__alloca (sizeof (struct gaih_servtuple)); __alloca (sizeof (struct gaih_servtuple));
if ((rc = gaih_inet_serv (service->name, tp, newp))) if ((rc = gaih_inet_serv (service->name, tp, newp)))