purge socketaddr call in favor of getsockname

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

diff --git a/usr/src/lib/libc/net/getnetent.c b/usr/src/lib/libc/net/getnetent.c
index 1eabb17..722e960 100644 (file)
--- a/usr/src/lib/libc/net/getnetent.c
+++ b/usr/src/lib/libc/net/getnetent.c
@@ -1,4 +1,4 @@
-/*     getnetent.c     4.4     82/10/07        */
+/*     getnetent.c     4.7     83/01/02        */

 
 #include <stdio.h>
 #include <sys/socket.h>
 
 #include <stdio.h>
 #include <sys/socket.h>


@@ -7,7 +7,7 @@
 
 #define        MAXALIASES      35
 
 
 #define        MAXALIASES      35
 

-static char *NETDB = "/usr/lib/networks";
+static char NETDB[] = "/etc/networks";

 static FILE *netf = NULL;
 static char line[BUFSIZ+1];
 static struct netent net;
 static FILE *netf = NULL;
 static char line[BUFSIZ+1];
 static struct netent net;


@@ -63,9 +63,10 @@ again:
                *p++ = '\0';
        net.n_net = inet_network(cp);
        net.n_addrtype = AF_INET;
                *p++ = '\0';
        net.n_net = inet_network(cp);
        net.n_addrtype = AF_INET;

-       net.n_aliases = net_aliases;
-       q = net_aliases, cp = p;
-       while (*cp) {
+       q = net.n_aliases = net_aliases;
+       if (p != NULL) 
+               cp = p;
+       while (cp && *cp) {

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


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

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

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