BSD 4_4 release

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

diff --git a/usr/src/lib/libc/net/getprotoent.c b/usr/src/lib/libc/net/getprotoent.c
index b77786f..c10ae33 100644 (file)
--- a/usr/src/lib/libc/net/getprotoent.c
+++ b/usr/src/lib/libc/net/getprotoent.c
@@ -1,31 +1,46 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)getprotoent.c      5.7 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)getprotoent.c      8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-#include <stdio.h>

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>

-#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 
 #define        MAXALIASES      35
 
 
 #define        MAXALIASES      35
 


@@ -33,9 +48,9 @@ static FILE *protof = NULL;
 static char line[BUFSIZ+1];
 static struct protoent proto;
 static char *proto_aliases[MAXALIASES];
 static char line[BUFSIZ+1];
 static struct protoent proto;
 static char *proto_aliases[MAXALIASES];

-static char *any();

 int _proto_stayopen;
 
 int _proto_stayopen;
 

+void

 setprotoent(f)
        int f;
 {
 setprotoent(f)
        int f;
 {


@@ -46,6 +61,7 @@ setprotoent(f)
        _proto_stayopen |= f;
 }
 
        _proto_stayopen |= f;
 }
 

+void

 endprotoent()
 {
        if (protof) {
 endprotoent()
 {
        if (protof) {


@@ -68,18 +84,18 @@ again:
                return (NULL);
        if (*p == '#')
                goto again;
                return (NULL);
        if (*p == '#')
                goto again;

-       cp = any(p, "#\n");
+       cp = strpbrk(p, "#\n");

        if (cp == NULL)
                goto again;
        *cp = '\0';
        proto.p_name = p;
        if (cp == NULL)
                goto again;
        *cp = '\0';
        proto.p_name = p;

-       cp = any(p, " \t");
+       cp = strpbrk(p, " \t");

        if (cp == NULL)
                goto again;
        *cp++ = '\0';
        while (*cp == ' ' || *cp == '\t')
                cp++;
        if (cp == NULL)
                goto again;
        *cp++ = '\0';
        while (*cp == ' ' || *cp == '\t')
                cp++;

-       p = any(cp, " \t");
+       p = strpbrk(cp, " \t");

        if (p != NULL)
                *p++ = '\0';
        proto.p_proto = atoi(cp);
        if (p != NULL)
                *p++ = '\0';
        proto.p_proto = atoi(cp);


@@ -93,7 +109,7 @@ again:
                        }
                        if (q < &proto_aliases[MAXALIASES - 1])
                                *q++ = cp;
                        }
                        if (q < &proto_aliases[MAXALIASES - 1])
                                *q++ = cp;

-                       cp = any(cp, " \t");
+                       cp = strpbrk(cp, " \t");

                        if (cp != NULL)
                                *cp++ = '\0';
                }
                        if (cp != NULL)
                                *cp++ = '\0';
                }


@@ -101,19 +117,3 @@ again:
        *q = NULL;
        return (&proto);
 }
        *q = NULL;
        return (&proto);
 }

-
-static char *
-any(cp, match)
-       register char *cp;
-       char *match;
-{
-       register char *mp, c;
-
-       while (c = *cp) {
-               for (mp = match; *mp; mp++)
-                       if (*mp == c)
-                               return (cp);
-               cp++;
-       }
-       return ((char *)0);
-}