[src/trunk]: src/libexec fix nested extern

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/111297938927
branches:  trunk
changeset: 503342:111297938927
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 22:14:13 2001 +0000

description:
fix nested extern

diffstat:

 libexec/rlogind/rlogind.c |  11 ++++++-----
 libexec/rshd/rshd.c       |   8 ++++----
 libexec/talkd/talkd.c     |   9 +++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diffs (137 lines):

diff -r 4e86bea842fb -r 111297938927 libexec/rlogind/rlogind.c
--- a/libexec/rlogind/rlogind.c Sun Feb 04 22:12:47 2001 +0000
+++ b/libexec/rlogind/rlogind.c Sun Feb 04 22:14:13 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rlogind.c,v 1.23 2001/01/10 01:41:38 lukem Exp $       */
+/*     $NetBSD: rlogind.c,v 1.24 2001/02/04 22:14:13 christos Exp $    */
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)rlogind.c  8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: rlogind.c,v 1.23 2001/01/10 01:41:38 lukem Exp $");
+__RCSID("$NetBSD: rlogind.c,v 1.24 2001/02/04 22:14:13 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -144,12 +144,15 @@
 char   *topdomain __P((char *));
 int    main __P((int, char *[]));
 
+extern int __check_rhosts_file;
+extern char *__rcmd_errstr;    /* syslog hook from libc/net/rcmd.c */
+extern char **environ;
+
 int
 main(argc, argv)
        int argc;
        char *argv[];
 {
-       extern int __check_rhosts_file;
        struct sockaddr_storage from;
        int ch, fromlen, on;
 
@@ -653,7 +656,6 @@
        struct sockaddr *dest;
        char *host;
 {
-       extern char *__rcmd_errstr;     /* syslog hook from libc/net/rcmd.c */
        int retval;
 
        getstr(rusername, sizeof(rusername), "remuser too long");
@@ -702,7 +704,6 @@
        } while (c != 0);
 }
 
-extern char **environ;
 
 void
 setup_term(fd)
diff -r 4e86bea842fb -r 111297938927 libexec/rshd/rshd.c
--- a/libexec/rshd/rshd.c       Sun Feb 04 22:12:47 2001 +0000
+++ b/libexec/rshd/rshd.c       Sun Feb 04 22:14:13 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rshd.c,v 1.22 2001/01/11 01:32:34 lukem Exp $  */
+/*     $NetBSD: rshd.c,v 1.23 2001/02/04 22:14:57 christos Exp $       */
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)rshd.c     8.2 (Berkeley) 4/6/94";
 #else
-__RCSID("$NetBSD: rshd.c,v 1.22 2001/01/11 01:32:34 lukem Exp $");
+__RCSID("$NetBSD: rshd.c,v 1.23 2001/02/04 22:14:57 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -123,13 +123,14 @@
 int    main __P((int, char *[]));
 
 #define        OPTIONS "alnL"
+extern int __check_rhosts_file;
+extern char *__rcmd_errstr;    /* syslog hook from libc/net/rcmd.c. */
 
 int
 main(argc, argv)
        int argc;
        char *argv[];
 {
-       extern int __check_rhosts_file;
        struct linger linger;
        int ch, on = 1, fromlen;
        struct sockaddr_storage from;
@@ -224,7 +225,6 @@
 doit(fromp)
        struct sockaddr *fromp;
 {
-       extern char *__rcmd_errstr;     /* syslog hook from libc/net/rcmd.c. */
        struct passwd *pwd;
        in_port_t port;
        fd_set ready, readfrom;
diff -r 4e86bea842fb -r 111297938927 libexec/talkd/talkd.c
--- a/libexec/talkd/talkd.c     Sun Feb 04 22:12:47 2001 +0000
+++ b/libexec/talkd/talkd.c     Sun Feb 04 22:14:13 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: talkd.c,v 1.10 1998/07/06 06:49:16 mrg Exp $   */
+/*     $NetBSD: talkd.c,v 1.11 2001/02/04 22:16:34 christos Exp $      */
 
 /*
  * Copyright (c) 1983, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)talkd.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: talkd.c,v 1.10 1998/07/06 06:49:16 mrg Exp $");
+__RCSID("$NetBSD: talkd.c,v 1.11 2001/02/04 22:16:34 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -87,6 +87,8 @@
 static void timeout __P((int));
 int    main __P((int, char *[]));
 
+extern char *__progname;
+
 int
 main(argc, argv)
        int argc;
@@ -94,7 +96,6 @@
 {
        CTL_MSG *mp = &request;
        int cc, ch;
-       extern char *__progname;
 
        openlog("talkd", LOG_PID, LOG_DAEMON);
        while ((ch = getopt(argc, argv, "dl")) != -1)
@@ -106,7 +107,7 @@
                        logging = 1;
                        break;
                default:
-                       syslog(LOG_ERR, "usage: %s [-dl]", __progname);
+                       syslog(LOG_ERR, "Usage: %s [-dl]", __progname);
                        exit(1);
                }