sockaddr's now require length (K. Sklower);

[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 adf0784..fff9bb7 100644 (file)
--- a/usr/src/lib/libc/net/getprotoent.c
+++ b/usr/src/lib/libc/net/getprotoent.c
@@ -1,12 +1,23 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

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

-static char sccsid[] = "@(#)getprotoent.c      5.2 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)getprotoent.c      5.5 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

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


@@ -21,8 +32,8 @@ 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 int stayopen = 0;

 static char *any();
 static char *any();

+int _proto_stayopen;

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


@@ -31,15 +42,16 @@ setprotoent(f)
                protof = fopen(PROTODB, "r" );
        else
                rewind(protof);
                protof = fopen(PROTODB, "r" );
        else
                rewind(protof);

-       stayopen |= f;
+       _proto_stayopen |= f;

 }
 
 endprotoent()
 {
 }
 
 endprotoent()
 {

-       if (protof && !stayopen) {
+       if (protof) {

                fclose(protof);
                protof = NULL;
        }
                fclose(protof);
                protof = NULL;
        }

+       _proto_stayopen = 0;

 }
 
 struct protoent *
 }
 
 struct protoent *