diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-08-18 01:03:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-18 01:03:06 +0000 |
| commit | 1728b767f03e4b0129534a51638732519648abe8 (patch) | |
| tree | 1664f1a4545cbe6c9660d8c29afa02b912f4d672 | |
| parent | 3710e0790c61e51ceeab69162fa746625e8df452 (diff) | |
we have getprotobyname_r() now so use it
| -rw-r--r-- | libc/inet/rpc/clnt_generic.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/libc/inet/rpc/clnt_generic.c b/libc/inet/rpc/clnt_generic.c index 349c0f62d..c8fe545c3 100644 --- a/libc/inet/rpc/clnt_generic.c +++ b/libc/inet/rpc/clnt_generic.c @@ -53,7 +53,9 @@ clnt_create (const char *hostname, u_long prog, u_long vers, struct hostent hostbuf, *h; size_t hstbuflen; char *hsttmpbuf; - struct protoent *p; + struct protoent protobuf, *p; + size_t prtbuflen; + char *prttmpbuf; struct sockaddr_in sin; struct sockaddr_un sun; int sock; @@ -113,14 +115,23 @@ clnt_create (const char *hostname, u_long prog, u_long vers, memset (sin.sin_zero, 0, sizeof (sin.sin_zero)); memcpy ((char *) &sin.sin_addr, h->h_addr, h->h_length); -#warning getprotobyname is not reentrant... Add getprotobyname_r - p = getprotobyname(proto); - if (p == NULL) { - struct rpc_createerr *ce = &get_rpc_createerr (); - ce->cf_stat = RPC_UNKNOWNPROTO; - ce->cf_error.re_errno = EPFNOSUPPORT; - return NULL; - } + prtbuflen = 1024; + prttmpbuf = alloca (prtbuflen); + while (getprotobyname_r (proto, &protobuf, prttmpbuf, prtbuflen, &p) != 0 + || p == NULL) + if (errno != ERANGE) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + ce->cf_stat = RPC_UNKNOWNPROTO; + ce->cf_error.re_errno = EPFNOSUPPORT; + return NULL; + } + else + { + /* Enlarge the buffer. */ + prtbuflen *= 2; + prttmpbuf = alloca (prtbuflen); + } sock = RPC_ANYSOCK; switch (p->p_proto) |