null pointer stuff from sun

SCCS-vsn: lib/libc/net/SCCS/hosttable/gethostent.c 4.5
SCCS-vsn: lib/libc/net/getnetent.c 4.7
SCCS-vsn: lib/libc/net/getprotoent.c 4.5
SCCS-vsn: lib/libc/net/getservent.c 4.5

diff --git a/usr/src/lib/libc/net/SCCS/hosttable/gethostent.c b/usr/src/lib/libc/net/SCCS/hosttable/gethostent.c
index f3e5aab..757cf30 100644 (file)
--- a/usr/src/lib/libc/net/SCCS/hosttable/gethostent.c
+++ b/usr/src/lib/libc/net/SCCS/hosttable/gethostent.c
@@ -1,4 +1,4 @@
-/*     gethostent.c    4.4     82/12/17        */
+/*     gethostent.c    4.5     83/01/02        */

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


@@ -70,19 +70,18 @@ again:
        host.h_name = cp;
        q = host.h_aliases = host_aliases;
        cp = any(cp, " \t");
        host.h_name = cp;
        q = host.h_aliases = host_aliases;
        cp = any(cp, " \t");

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

                *cp++ = '\0';
                *cp++ = '\0';

-               while (*cp) {
-                       if (*cp == ' ' || *cp == '\t') {
-                               cp++;
-                               continue;
-                       }
-                       if (q < &host_aliases[MAXALIASES - 1])
-                               *q++ = cp;
-                       cp = any(cp, " \t");
-                       if (*cp != NULL)
-                               *cp++ = '\0';
+       while (cp && *cp) {
+               if (*cp == ' ' || *cp == '\t') {
+                       cp++;
+                       continue;

                }
                }

+               if (q < &host_aliases[MAXALIASES - 1])
+                       *q++ = cp;
+               cp = any(cp, " \t");
+               if (cp != NULL)
+                       *cp++ = '\0';

        }
        *q = NULL;
        return (&host);
        }
        *q = NULL;
        return (&host);

diff --git a/usr/src/lib/libc/net/getnetent.c b/usr/src/lib/libc/net/getnetent.c
index c5da157..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.6     82/12/17        */
+/*     getnetent.c     4.7     83/01/02        */

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


@@ -64,19 +64,18 @@ again:
        net.n_net = inet_network(cp);
        net.n_addrtype = AF_INET;
        q = net.n_aliases = net_aliases;
        net.n_net = inet_network(cp);
        net.n_addrtype = AF_INET;
        q = net.n_aliases = net_aliases;

-       if (p != NULL) {
+       if (p != NULL) 

                cp = p;
                cp = p;

-               while (*cp) {
-                       if (*cp == ' ' || *cp == '\t') {
-                               cp++;
-                               continue;
-                       }
-                       if (q < &net_aliases[MAXALIASES - 1])
-                               *q++ = cp;
-                       cp = any(cp, " \t");
-                       if (*cp != NULL)
-                               *cp++ = '\0';
+       while (cp && *cp) {
+               if (*cp == ' ' || *cp == '\t') {
+                       cp++;
+                       continue;

                }
                }

+               if (q < &net_aliases[MAXALIASES - 1])
+                       *q++ = cp;
+               cp = any(cp, " \t");
+               if (cp != NULL)
+                       *cp++ = '\0';

        }
        *q = NULL;
        return (&net);
        }
        *q = NULL;
        return (&net);

diff --git a/usr/src/lib/libc/net/getprotoent.c b/usr/src/lib/libc/net/getprotoent.c
index 7385539..318ed30 100644 (file)
--- a/usr/src/lib/libc/net/getprotoent.c
+++ b/usr/src/lib/libc/net/getprotoent.c
@@ -1,4 +1,4 @@
-/*     getprotoent.c   4.4     82/12/17        */
+/*     getprotoent.c   4.5     83/01/02        */

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


@@ -64,7 +64,7 @@ again:
        q = proto.p_aliases = proto_aliases;
        if (p != NULL) {
                cp = p;
        q = proto.p_aliases = proto_aliases;
        if (p != NULL) {
                cp = p;

-               while (*cp) {
+               while (cp && *cp) {

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


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

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

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

diff --git a/usr/src/lib/libc/net/getservent.c b/usr/src/lib/libc/net/getservent.c
index 099a6ce..7786ebd 100644 (file)
--- a/usr/src/lib/libc/net/getservent.c
+++ b/usr/src/lib/libc/net/getservent.c
@@ -1,4 +1,4 @@
-/*     getservent.c    4.4     82/12/17        */
+/*     getservent.c    4.5     83/01/02        */

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


@@ -66,19 +66,18 @@ again:
        serv.s_proto = cp;
        q = serv.s_aliases = serv_aliases;
        cp = any(cp, " \t");
        serv.s_proto = cp;
        q = serv.s_aliases = serv_aliases;
        cp = any(cp, " \t");

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

                *cp++ = '\0';
                *cp++ = '\0';

-               while (*cp) {
-                       if (*cp == ' ' || *cp == '\t') {
-                               cp++;
-                               continue;
-                       }
-                       if (q < &serv_aliases[MAXALIASES - 1])
-                               *q++ = cp;
-                       cp = any(cp, " \t");
-                       if (*cp != NULL)
-                               *cp++ = '\0';
+       while (cp && *cp) {
+               if (*cp == ' ' || *cp == '\t') {
+                       cp++;
+                       continue;

                }
                }

+               if (q < &serv_aliases[MAXALIASES - 1])
+                       *q++ = cp;
+               cp = any(cp, " \t");
+               if (cp != NULL)
+                       *cp++ = '\0';

        }
        *q = NULL;
        return (&serv);
        }
        *q = NULL;
        return (&serv);