purge socketaddr call in favor of getsockname

[unix-history] / usr / src / lib / libc / net / getservent.c

diff --git a/usr/src/lib/libc/net/getservent.c b/usr/src/lib/libc/net/getservent.c
index 7264c50..7786ebd 100644 (file)
--- a/usr/src/lib/libc/net/getservent.c
+++ b/usr/src/lib/libc/net/getservent.c
@@ -1,19 +1,19 @@
-/*     getservent.c    4.1     82/08/25        */
+/*     getservent.c    4.5     83/01/02        */

 
 #include <stdio.h>
 
 #include <stdio.h>

+#include <sys/types.h>

 #include <sys/socket.h>
 #include <netdb.h>
 #include <ctype.h>
 
 #define        MAXALIASES      35
 
 #include <sys/socket.h>
 #include <netdb.h>
 #include <ctype.h>
 
 #define        MAXALIASES      35
 

-static char SERVDB[] = "/usr/lib/services";
+static char SERVDB[] = "/etc/services";

 static FILE *servf = NULL;
 static char line[BUFSIZ+1];
 static struct servent serv;
 static char *serv_aliases[MAXALIASES];
 static int stayopen = 0;
 static FILE *servf = NULL;
 static char line[BUFSIZ+1];
 static struct servent serv;
 static char *serv_aliases[MAXALIASES];
 static int stayopen = 0;

-static unsigned long value();

 static char *any();
 
 setservent(f)
 static char *any();
 
 setservent(f)


@@ -62,14 +62,13 @@ again:
        if (cp == NULL)
                goto again;
        *cp++ = '\0';
        if (cp == NULL)
                goto again;
        *cp++ = '\0';

-       serv.s_port = atoi(p);
+       serv.s_port = htons((u_short)atoi(p));

        serv.s_proto = cp;
        serv.s_proto = cp;

+       q = serv.s_aliases = serv_aliases;

        cp = any(cp, " \t");
        if (cp != NULL)
                *cp++ = '\0';
        cp = any(cp, " \t");
        if (cp != NULL)
                *cp++ = '\0';

-       serv.s_aliases = serv_aliases;
-       q = serv_aliases;
-       while (*cp) {
+       while (cp && *cp) {

                if (*cp == ' ' || *cp == '\t') {
                        cp++;
                        continue;
                if (*cp == ' ' || *cp == '\t') {
                        cp++;
                        continue;


@@ -77,7 +76,7 @@ again:
                if (q < &serv_aliases[MAXALIASES - 1])
                        *q++ = cp;
                cp = any(cp, " \t");
                if (q < &serv_aliases[MAXALIASES - 1])
                        *q++ = cp;
                cp = any(cp, " \t");

-               if (*cp != NULL)
+               if (cp != NULL)

                        *cp++ = '\0';
        }
        *q = NULL;
                        *cp++ = '\0';
        }
        *q = NULL;