Change return value of reentrant getproto* and getserv* to match the

IBM/Digital API.

1 files changed, 10 insertions, 8 deletions

diff --git a/src/lib/libc/net/getservbyport.c b/src/lib/libc/net/getservbyport.c
index e8b8efc504..5e210b2e8b 100644
--- a/src/lib/libc/net/getservbyport.c
+++ b/src/lib/libc/net/getservbyport.c
@@ -28,31 +28,31 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservbyport.c,v 1.5 2004/10/17 20:24:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: getservbyport.c,v 1.6 2004/10/25 03:09:01 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 
-struct servent *
+int
 getservbyport_r(int port, const char *proto, struct servent *se,
     struct servent_data *sd)
 {
-        struct servent *p;
+        int error;
 
         setservent_r(sd->stayopen, sd);
-        while ((p = getservent_r(se, sd))) {
-                if (p->s_port != port)
+        while ((error = getservent_r(se, sd)) == 0) {
+                if (se->s_port != port)
                         continue;
-                if (proto == 0 || strcmp(p->s_proto, proto) == 0)
+                if (proto == 0 || strcmp(se->s_proto, proto) == 0)
                         break;
         }
         if (!sd->stayopen && sd->fp != NULL) {
                 fclose(sd->fp);
                 sd->fp = NULL;
         }
-        return (p);
+        return (error);
 }
 
 struct servent *
@@ -61,5 +61,7 @@ getservbyport(int port, const char *proto)
         extern struct servent_data _servent_data;
         static struct servent serv;
 
-        return (getservbyport_r(port, proto, &serv, &_servent_data));
+        if (getservbyport_r(port, proto, &serv, &_servent_data) != 0)
+                return (NULL);
+        return (&serv);
 }