BSD 4_3_Reno release

[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 d21439e..f917c2a 100644 (file)
--- a/usr/src/lib/libc/net/getnetent.c
+++ b/usr/src/lib/libc/net/getnetent.c
@@ -1,12 +1,25 @@
 /*
  * 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: (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.

  */
 
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)getnetent.c        5.1 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getnetent.c        5.7 (Berkeley) 6/1/90";
+#endif /* LIBC_SCCS and not lint */

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


@@ -16,30 +29,30 @@ static char sccsid[] = "@(#)getnetent.c     5.1 (Berkeley) %G%";
 
 #define        MAXALIASES      35
 
 
 #define        MAXALIASES      35
 

-static char NETDB[] = "/etc/networks";

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

-static int stayopen = 0;
+int _net_stayopen;

 static char *any();
 
 setnetent(f)
        int f;
 {
        if (netf == NULL)
 static char *any();
 
 setnetent(f)
        int f;
 {
        if (netf == NULL)

-               netf = fopen(NETDB, "r" );
+               netf = fopen(_PATH_NETWORKS, "r" );

        else
                rewind(netf);
        else
                rewind(netf);

-       stayopen |= f;
+       _net_stayopen |= f;

 }
 
 endnetent()
 {
 }
 
 endnetent()
 {

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

                fclose(netf);
                netf = NULL;
        }
                fclose(netf);
                netf = NULL;
        }

+       _net_stayopen = 0;

 }
 
 struct netent *
 }
 
 struct netent *


@@ -48,7 +61,7 @@ getnetent()
        char *p;
        register char *cp, **q;
 
        char *p;
        register char *cp, **q;
 

-       if (netf == NULL && (netf = fopen(NETDB, "r" )) == NULL)
+       if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)

                return (NULL);
 again:
        p = fgets(line, BUFSIZ, netf);
                return (NULL);
 again:
        p = fgets(line, BUFSIZ, netf);