If I remember the story right, historically unistd.h did not declare those two, so to encourage portable reuse of parts of our tree they remained.
You touch the ssh directory, and I think if that was commited you would break downstream users, unless -portable handled it. Can a posix laywer pipe up? Jan Stary <h...@stare.cz> wrote: > This is in the vein of > https://marc.info/?l=openbsd-cvs&m=158170787221615&w=2 > > <unistd.h> declares "extern int optind" and friends, > so there is no need to declare them again. > Still builds on current/amd64. > > Leaving out gnu, nsd, unbound (third party) > and tic (is that third party)? > > Also leaving out pr and rcs > who do their own thing. > > Jan > > > Index: sys/dev/microcode/aic7xxx/aicasm.c > =================================================================== > RCS file: /cvs/src/sys/dev/microcode/aic7xxx/aicasm.c,v > retrieving revision 1.16 > diff -u -p -r1.16 aicasm.c > --- sys/dev/microcode/aic7xxx/aicasm.c 19 Dec 2014 22:44:58 -0000 > 1.16 > +++ sys/dev/microcode/aic7xxx/aicasm.c 15 Jul 2020 14:45:14 -0000 > @@ -112,8 +112,6 @@ int main(int argc, char *argv[]); > int > main(int argc, char *argv[]) > { > - extern char *optarg; > - extern int optind; > int ch; > int retval; > char *inputfilename; > Index: usr.bin/env/env.c > =================================================================== > RCS file: /cvs/src/usr.bin/env/env.c,v > retrieving revision 1.17 > diff -u -p -r1.17 env.c > --- usr.bin/env/env.c 28 Oct 2016 07:22:59 -0000 1.17 > +++ usr.bin/env/env.c 15 Jul 2020 14:45:14 -0000 > @@ -42,7 +42,6 @@ int > main(int argc, char *argv[]) > { > extern char **environ; > - extern int optind; > char **ep, *p; > int ch; > > Index: usr.bin/finger/finger.c > =================================================================== > RCS file: /cvs/src/usr.bin/finger/finger.c,v > retrieving revision 1.27 > diff -u -p -r1.27 finger.c > --- usr.bin/finger/finger.c 26 Apr 2018 12:42:51 -0000 1.27 > +++ usr.bin/finger/finger.c 15 Jul 2020 14:45:14 -0000 > @@ -76,7 +76,6 @@ PERSON *phead, *ptail; > int > main(int argc, char *argv[]) > { > - extern int optind; > extern char *__progname; > int ch; > char domain[HOST_NAME_MAX+1]; > Index: usr.bin/ftp/cmds.c > =================================================================== > RCS file: /cvs/src/usr.bin/ftp/cmds.c,v > retrieving revision 1.84 > diff -u -p -r1.84 cmds.c > --- usr.bin/ftp/cmds.c 18 Nov 2019 04:37:35 -0000 1.84 > +++ usr.bin/ftp/cmds.c 15 Jul 2020 14:45:14 -0000 > @@ -217,7 +217,6 @@ usage: > void > mput(int argc, char *argv[]) > { > - extern int optind, optreset; > int ch, i, restartit = 0; > sig_t oldintr; > char *cmd, *tp, *xargv[] = { argv[0], NULL, NULL }; > Index: usr.bin/ftp/small.c > =================================================================== > RCS file: /cvs/src/usr.bin/ftp/small.c,v > retrieving revision 1.12 > diff -u -p -r1.12 small.c > --- usr.bin/ftp/small.c 18 Nov 2019 04:37:35 -0000 1.12 > +++ usr.bin/ftp/small.c 15 Jul 2020 14:45:14 -0000 > @@ -326,7 +326,6 @@ mabort(int signo) > void > mget(int argc, char *argv[]) > { > - extern int optind, optreset; > sig_t oldintr; > int xargc = 2; > char *cp, localcwd[PATH_MAX], *xargv[] = { argv[0], NULL, NULL }; > Index: usr.bin/getopt/getopt.c > =================================================================== > RCS file: /cvs/src/usr.bin/getopt/getopt.c,v > retrieving revision 1.10 > diff -u -p -r1.10 getopt.c > --- usr.bin/getopt/getopt.c 9 Oct 2015 01:37:07 -0000 1.10 > +++ usr.bin/getopt/getopt.c 15 Jul 2020 14:45:14 -0000 > @@ -13,8 +13,6 @@ > int > main(int argc, char *argv[]) > { > - extern int optind; > - extern char *optarg; > int c; > int status = 0; > > Index: usr.bin/locate/code/locate.code.c > =================================================================== > RCS file: /cvs/src/usr.bin/locate/code/locate.code.c,v > retrieving revision 1.21 > diff -u -p -r1.21 locate.code.c > --- usr.bin/locate/code/locate.code.c 17 Jan 2019 06:15:44 -0000 1.21 > +++ usr.bin/locate/code/locate.code.c 15 Jul 2020 14:45:14 -0000 > @@ -106,8 +106,6 @@ int bgindex(char *); > > > void usage(void); > -extern int optind; > -extern int optopt; > > int > main(int argc, char *argv[]) > Index: usr.bin/m4/main.c > =================================================================== > RCS file: /cvs/src/usr.bin/m4/main.c,v > retrieving revision 1.87 > diff -u -p -r1.87 main.c > --- usr.bin/m4/main.c 15 Jun 2017 13:48:42 -0000 1.87 > +++ usr.bin/m4/main.c 15 Jul 2020 14:45:14 -0000 > @@ -138,9 +138,6 @@ struct keyblk keywrds[] = { /* m4 keywor > > #define MAXKEYS (sizeof(keywrds)/sizeof(struct keyblk)) > > -extern int optind; > -extern char *optarg; > - > #define MAXRECORD 50 > static struct position { > char *name; > Index: usr.bin/mklocale/yacc.y > =================================================================== > RCS file: /cvs/src/usr.bin/mklocale/yacc.y,v > retrieving revision 1.10 > diff -u -p -r1.10 yacc.y > --- usr.bin/mklocale/yacc.y 8 May 2016 15:25:44 -0000 1.10 > +++ usr.bin/mklocale/yacc.y 15 Jul 2020 14:45:14 -0000 > @@ -250,9 +250,6 @@ main(int ac, char *av[]) > { > int x; > > - extern char *optarg; > - extern int optind; > - > if (pledge("stdio rpath wpath cpath", NULL) == -1) { > perror("pledge"); > exit(1); > Index: usr.bin/netstat/main.c > =================================================================== > RCS file: /cvs/src/usr.bin/netstat/main.c,v > retrieving revision 1.120 > diff -u -p -r1.120 main.c > --- usr.bin/netstat/main.c 16 Jun 2020 14:03:42 -0000 1.120 > +++ usr.bin/netstat/main.c 15 Jul 2020 14:45:14 -0000 > @@ -109,8 +109,6 @@ kvm_t *kvmd; > int > main(int argc, char *argv[]) > { > - extern char *optarg; > - extern int optind; > const char *errstr; > struct protox *tp = NULL; /* for printing cblocks & stats */ > int ch; > Index: usr.bin/nfsstat/nfsstat.c > =================================================================== > RCS file: /cvs/src/usr.bin/nfsstat/nfsstat.c,v > retrieving revision 1.36 > diff -u -p -r1.36 nfsstat.c > --- usr.bin/nfsstat/nfsstat.c 27 Aug 2016 04:07:42 -0000 1.36 > +++ usr.bin/nfsstat/nfsstat.c 15 Jul 2020 14:45:14 -0000 > @@ -78,8 +78,6 @@ int > main(int argc, char *argv[]) > { > u_int interval, display = SHOW_ALL; > - extern int optind; > - extern char *optarg; > char *memf, *nlistf; > const char *errstr; > int ch; > Index: usr.bin/nm/nm.c > =================================================================== > RCS file: /cvs/src/usr.bin/nm/nm.c,v > retrieving revision 1.54 > diff -u -p -r1.54 nm.c > --- usr.bin/nm/nm.c 3 Mar 2019 16:07:39 -0000 1.54 > +++ usr.bin/nm/nm.c 15 Jul 2020 14:45:14 -0000 > @@ -130,7 +130,6 @@ int > main(int argc, char *argv[]) > { > extern char *__progname; > - extern int optind; > const char *optstr; > const struct option *lopts; > int ch, eval; > Index: usr.bin/passwd/passwd.c > =================================================================== > RCS file: /cvs/src/usr.bin/passwd/passwd.c,v > retrieving revision 1.27 > diff -u -p -r1.27 passwd.c > --- usr.bin/passwd/passwd.c 26 Nov 2015 19:01:47 -0000 1.27 > +++ usr.bin/passwd/passwd.c 15 Jul 2020 14:45:14 -0000 > @@ -41,7 +41,6 @@ void usage(int retval); > int > main(int argc, char **argv) > { > - extern int optind; > char *username; > int ch; > > Index: usr.bin/paste/paste.c > =================================================================== > RCS file: /cvs/src/usr.bin/paste/paste.c,v > retrieving revision 1.26 > diff -u -p -r1.26 paste.c > --- usr.bin/paste/paste.c 4 Aug 2018 19:19:37 -0000 1.26 > +++ usr.bin/paste/paste.c 15 Jul 2020 14:45:14 -0000 > @@ -53,8 +53,6 @@ void sequential(char **); > int > main(int argc, char *argv[]) > { > - extern char *optarg; > - extern int optind; > int ch, seq; > > if (pledge("stdio rpath", NULL) == -1) > Index: usr.bin/quota/quota.c > =================================================================== > RCS file: /cvs/src/usr.bin/quota/quota.c,v > retrieving revision 1.39 > diff -u -p -r1.39 quota.c > --- usr.bin/quota/quota.c 26 Apr 2018 12:42:51 -0000 1.39 > +++ usr.bin/quota/quota.c 15 Jul 2020 14:45:14 -0000 > @@ -98,8 +98,6 @@ main(int argc, char *argv[]) > gid_t mygid, gidset[NGROUPS_MAX]; > int i, gflag = 0, uflag = 0; > int ch; > - extern char *optarg; > - extern int optind; > > while ((ch = getopt(argc, argv, "ugvq")) != -1) { > switch(ch) { > Index: usr.bin/readlink/readlink.c > =================================================================== > RCS file: /cvs/src/usr.bin/readlink/readlink.c,v > retrieving revision 1.28 > diff -u -p -r1.28 readlink.c > --- usr.bin/readlink/readlink.c 28 Jun 2019 13:35:03 -0000 1.28 > +++ usr.bin/readlink/readlink.c 15 Jul 2020 14:45:14 -0000 > @@ -42,7 +42,6 @@ main(int argc, char *argv[]) > { > char buf[PATH_MAX]; > int n, ch, nflag = 0, fflag = 0; > - extern int optind; > > if (pledge("stdio rpath", NULL) == -1) > err(1, "pledge"); > Index: usr.bin/rpcinfo/rpcinfo.c > =================================================================== > RCS file: /cvs/src/usr.bin/rpcinfo/rpcinfo.c,v > retrieving revision 1.15 > diff -u -p -r1.15 rpcinfo.c > --- usr.bin/rpcinfo/rpcinfo.c 28 Jun 2019 13:35:03 -0000 1.15 > +++ usr.bin/rpcinfo/rpcinfo.c 15 Jul 2020 14:45:14 -0000 > @@ -84,8 +84,6 @@ int > main(int argc, char *argv[]) > { > int c; > - extern char *optarg; > - extern int optind; > int errflg; > int function; > u_short portnum; > Index: usr.bin/rup/rup.c > =================================================================== > RCS file: /cvs/src/usr.bin/rup/rup.c,v > retrieving revision 1.31 > diff -u -p -r1.31 rup.c > --- usr.bin/rup/rup.c 20 Mar 2017 16:10:10 -0000 1.31 > +++ usr.bin/rup/rup.c 15 Jul 2020 14:45:14 -0000 > @@ -291,7 +291,6 @@ main(int argc, char *argv[]) > { > int ch; > size_t i; > - extern int optind; > > sort_type = SORT_NONE; > while ((ch = getopt(argc, argv, "dhlt")) != -1) > Index: usr.bin/ssh/scp.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/scp.c,v > retrieving revision 1.211 > diff -u -p -r1.211 scp.c > --- usr.bin/ssh/scp.c 29 May 2020 21:22:02 -0000 1.211 > +++ usr.bin/ssh/scp.c 15 Jul 2020 14:45:14 -0000 > @@ -382,8 +382,6 @@ main(int argc, char **argv) > int ch, fflag, tflag, status, n; > char **newargv; > const char *errstr; > - extern char *optarg; > - extern int optind; > > /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ > sanitise_stdfd(); > Index: usr.bin/ssh/session.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/session.c,v > retrieving revision 1.324 > diff -u -p -r1.324 session.c > --- usr.bin/ssh/session.c 7 Jul 2020 02:47:21 -0000 1.324 > +++ usr.bin/ssh/session.c 15 Jul 2020 14:45:14 -0000 > @@ -1339,7 +1339,6 @@ do_child(struct ssh *ssh, Session *s, co > fflush(NULL); > exit(1); > } else if (s->is_subsystem == SUBSYSTEM_INT_SFTP) { > - extern int optind, optreset; > int i; > char *p, *args; > > Index: usr.bin/ssh/sftp.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/sftp.c,v > retrieving revision 1.200 > diff -u -p -r1.200 sftp.c > --- usr.bin/ssh/sftp.c 3 Apr 2020 05:53:52 -0000 1.200 > +++ usr.bin/ssh/sftp.c 15 Jul 2020 14:45:14 -0000 > @@ -381,7 +381,6 @@ static int > parse_getput_flags(const char *cmd, char **argv, int argc, > int *aflag, int *fflag, int *pflag, int *rflag) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -416,7 +415,6 @@ parse_getput_flags(const char *cmd, char > static int > parse_link_flags(const char *cmd, char **argv, int argc, int *sflag) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -440,7 +438,6 @@ parse_link_flags(const char *cmd, char * > static int > parse_rename_flags(const char *cmd, char **argv, int argc, int *lflag) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -464,7 +461,6 @@ parse_rename_flags(const char *cmd, char > static int > parse_ls_flags(char **argv, int argc, int *lflag) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -517,7 +513,6 @@ parse_ls_flags(char **argv, int argc, in > static int > parse_df_flags(const char *cmd, char **argv, int argc, int *hflag, int > *iflag) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -544,7 +539,6 @@ parse_df_flags(const char *cmd, char **a > static int > parse_ch_flags(const char *cmd, char **argv, int argc, int *hflag) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -568,7 +562,6 @@ parse_ch_flags(const char *cmd, char **a > static int > parse_no_flags(const char *cmd, char **argv, int argc) > { > - extern int opterr, optind, optopt, optreset; > int ch; > > optind = optreset = 1; > @@ -2336,8 +2329,6 @@ main(int argc, char **argv) > const char *errstr; > LogLevel ll = SYSLOG_LEVEL_INFO; > arglist args; > - extern int optind; > - extern char *optarg; > struct sftp_conn *conn; > size_t copy_buffer_len = DEFAULT_COPY_BUFLEN; > size_t num_requests = DEFAULT_NUM_REQUESTS; > Index: usr.bin/ssh/ssh-add.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/ssh-add.c,v > retrieving revision 1.156 > diff -u -p -r1.156 ssh-add.c > --- usr.bin/ssh/ssh-add.c 26 Jun 2020 05:04:07 -0000 1.156 > +++ usr.bin/ssh/ssh-add.c 15 Jul 2020 14:45:14 -0000 > @@ -646,8 +646,6 @@ usage(void) > int > main(int argc, char **argv) > { > - extern char *optarg; > - extern int optind; > int agent_fd; > char *pkcs11provider = NULL, *skprovider = NULL; > int r, i, ch, deleting = 0, ret = 0, key_only = 0, do_download = 0; > Index: usr.bin/ssh/ssh-agent.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/ssh-agent.c,v > retrieving revision 1.262 > diff -u -p -r1.262 ssh-agent.c > --- usr.bin/ssh/ssh-agent.c 5 Jul 2020 23:59:45 -0000 1.262 > +++ usr.bin/ssh/ssh-agent.c 15 Jul 2020 14:45:14 -0000 > @@ -1254,8 +1254,6 @@ main(int ac, char **av) > int sock, fd, ch, result, saved_errno; > char *shell, *format, *pidstr, *agentsocket = NULL; > struct rlimit rlim; > - extern int optind; > - extern char *optarg; > pid_t pid; > char pidstrbuf[1 + 3 * sizeof pid]; > size_t len; > Index: usr.bin/ssh/ssh-keygen.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/ssh-keygen.c,v > retrieving revision 1.414 > diff -u -p -r1.414 ssh-keygen.c > --- usr.bin/ssh/ssh-keygen.c 15 Jul 2020 07:50:46 -0000 1.414 > +++ usr.bin/ssh/ssh-keygen.c 15 Jul 2020 14:45:14 -0000 > @@ -3084,9 +3084,6 @@ main(int argc, char **argv) > int log_level = SYSLOG_LEVEL_INFO; > char *sign_op = NULL; > > - extern int optind; > - extern char *optarg; > - > /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ > sanitise_stdfd(); > > Index: usr.bin/ssh/ssh-keyscan.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/ssh-keyscan.c,v > retrieving revision 1.131 > diff -u -p -r1.131 ssh-keyscan.c > --- usr.bin/ssh/ssh-keyscan.c 15 Dec 2019 19:47:10 -0000 1.131 > +++ usr.bin/ssh/ssh-keyscan.c 15 Jul 2020 14:45:14 -0000 > @@ -654,9 +654,6 @@ main(int argc, char **argv) > size_t linesize = 0; > FILE *fp; > > - extern int optind; > - extern char *optarg; > - > TAILQ_INIT(&tq); > > /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ > Index: usr.bin/ssh/ssh.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/ssh.c,v > retrieving revision 1.531 > diff -u -p -r1.531 ssh.c > --- usr.bin/ssh/ssh.c 5 Jul 2020 23:59:45 -0000 1.531 > +++ usr.bin/ssh/ssh.c 15 Jul 2020 14:45:14 -0000 > @@ -633,8 +633,6 @@ main(int ac, char **av) > char cname[NI_MAXHOST]; > struct stat st; > struct passwd *pw; > - extern int optind, optreset; > - extern char *optarg; > struct Forward fwd; > struct addrinfo *addrs = NULL; > size_t n, len; > Index: usr.bin/ssh/sshd.c > =================================================================== > RCS file: /cvs/src/usr.bin/ssh/sshd.c,v > retrieving revision 1.560 > diff -u -p -r1.560 sshd.c > --- usr.bin/ssh/sshd.c 3 Jul 2020 10:12:26 -0000 1.560 > +++ usr.bin/ssh/sshd.c 15 Jul 2020 14:45:14 -0000 > @@ -1440,8 +1440,6 @@ int > main(int ac, char **av) > { > struct ssh *ssh = NULL; > - extern char *optarg; > - extern int optind; > int r, opt, on = 1, already_daemon, remote_port; > int sock_in = -1, sock_out = -1, newsock = -1; > const char *remote_ip, *rdomain; > Index: usr.bin/systat/main.c > =================================================================== > RCS file: /cvs/src/usr.bin/systat/main.c,v > retrieving revision 1.72 > diff -u -p -r1.72 main.c > --- usr.bin/systat/main.c 12 Jan 2020 20:51:08 -0000 1.72 > +++ usr.bin/systat/main.c 15 Jul 2020 14:45:14 -0000 > @@ -419,8 +419,6 @@ main(int argc, char *argv[]) > { > char errbuf[_POSIX2_LINE_MAX]; > const char *errstr; > - extern char *optarg; > - extern int optind; > double delay = 5; > > char *viewstr = NULL; > Index: usr.bin/ul/ul.c > =================================================================== > RCS file: /cvs/src/usr.bin/ul/ul.c,v > retrieving revision 1.23 > diff -u -p -r1.23 ul.c > --- usr.bin/ul/ul.c 16 Oct 2016 11:28:54 -0000 1.23 > +++ usr.bin/ul/ul.c 15 Jul 2020 14:45:14 -0000 > @@ -97,8 +97,6 @@ void iattr(void); > int > main(int argc, char *argv[]) > { > - extern int optind; > - extern char *optarg; > int c; > char *termtype; > FILE *f; > Index: usr.bin/units/units.c > =================================================================== > RCS file: /cvs/src/usr.bin/units/units.c,v > retrieving revision 1.22 > diff -u -p -r1.22 units.c > --- usr.bin/units/units.c 9 Oct 2015 01:37:09 -0000 1.22 > +++ usr.bin/units/units.c 15 Jul 2020 14:45:14 -0000 > @@ -629,9 +629,6 @@ main(int argc, char **argv) > char *userfile = 0; > int quiet = 0; > > - extern char *optarg; > - extern int optind; > - > if (pledge("stdio rpath", NULL) == -1) > err(1, "pledge"); > > Index: usr.bin/vi/common/main.c > =================================================================== > RCS file: /cvs/src/usr.bin/vi/common/main.c,v > retrieving revision 1.41 > diff -u -p -r1.41 main.c > --- usr.bin/vi/common/main.c 10 Nov 2017 18:31:36 -0000 1.41 > +++ usr.bin/vi/common/main.c 15 Jul 2020 14:45:14 -0000 > @@ -44,8 +44,6 @@ static int v_obsolete(char *[]); > int > editor(GS *gp, int argc, char *argv[]) > { > - extern int optind; > - extern char *optarg; > const char *p; > EVENT ev; > FREF *frp; > Index: usr.bin/ypcat/ypcat.c > =================================================================== > RCS file: /cvs/src/usr.bin/ypcat/ypcat.c,v > retrieving revision 1.20 > diff -u -p -r1.20 ypcat.c > --- usr.bin/ypcat/ypcat.c 11 Nov 2015 02:52:46 -0000 1.20 > +++ usr.bin/ypcat/ypcat.c 15 Jul 2020 14:45:14 -0000 > @@ -84,8 +84,6 @@ main(int argc, char *argv[]) > { > char *domain = NULL, *inmap; > struct ypall_callback ypcb; > - extern char *optarg; > - extern int optind; > int notrans, c, r, i; > > if (pledge("stdio rpath inet getpw", NULL) == -1) { > Index: usr.bin/ypmatch/ypmatch.c > =================================================================== > RCS file: /cvs/src/usr.bin/ypmatch/ypmatch.c,v > retrieving revision 1.16 > diff -u -p -r1.16 ypmatch.c > --- usr.bin/ypmatch/ypmatch.c 8 Feb 2015 23:40:35 -0000 1.16 > +++ usr.bin/ypmatch/ypmatch.c 15 Jul 2020 14:45:14 -0000 > @@ -74,8 +74,6 @@ int > main(int argc, char *argv[]) > { > char *domainname, *inkey, *inmap, *outbuf; > - extern char *optarg; > - extern int optind; > int outbuflen, key, notrans, rval; > int c, r, i; > > Index: usr.sbin/amd/amd/get_args.c > =================================================================== > RCS file: /cvs/src/usr.sbin/amd/amd/get_args.c,v > retrieving revision 1.14 > diff -u -p -r1.14 get_args.c > --- usr.sbin/amd/amd/get_args.c 20 Oct 2014 02:33:42 -0000 1.14 > +++ usr.sbin/amd/amd/get_args.c 15 Jul 2020 14:45:14 -0000 > @@ -44,9 +44,6 @@ > #include <sys/stat.h> > #include <unistd.h> > > -extern int optind; > -extern char *optarg; > - > #if defined(DEBUG) && defined(PARANOID) > char **gargv; > #endif /* defined(DEBUG) && defined(PARANOID) */ > Index: usr.sbin/amd/amq/amq.c > =================================================================== > RCS file: /cvs/src/usr.sbin/amd/amq/amq.c,v > retrieving revision 1.21 > diff -u -p -r1.21 amq.c > --- usr.sbin/amd/amq/amq.c 21 Jan 2017 08:33:51 -0000 1.21 > +++ usr.sbin/amd/amq/amq.c 15 Jul 2020 14:45:14 -0000 > @@ -59,9 +59,6 @@ static char *xlog_optstr; > static char localhost[] = "localhost"; > static char *def_server = localhost; > > -extern int optind; > -extern char *optarg; > - > static struct timeval tmo = { 10, 0 }; > #define TIMEOUT tmo > > Index: usr.sbin/crunchgen/crunchgen.c > =================================================================== > RCS file: /cvs/src/usr.sbin/crunchgen/crunchgen.c,v > retrieving revision 1.21 > diff -u -p -r1.21 crunchgen.c > --- usr.sbin/crunchgen/crunchgen.c 18 Oct 2018 14:25:14 -0000 1.21 > +++ usr.sbin/crunchgen/crunchgen.c 15 Jul 2020 14:45:14 -0000 > @@ -117,8 +117,6 @@ main(int argc, char *argv[]) > { > char *p; > int optc; > - extern int optind; > - extern char *optarg; > > if (pledge("stdio rpath wpath cpath proc exec", NULL) == -1) { > perror("pledge"); > Index: usr.sbin/mtree/mtree.c > =================================================================== > RCS file: /cvs/src/usr.sbin/mtree/mtree.c,v > retrieving revision 1.26 > diff -u -p -r1.26 mtree.c > --- usr.sbin/mtree/mtree.c 16 Sep 2018 12:43:40 -0000 1.26 > +++ usr.sbin/mtree/mtree.c 15 Jul 2020 14:45:15 -0000 > @@ -55,8 +55,6 @@ static void usage(void); > int > main(int argc, char *argv[]) > { > - extern int optind; > - extern char *optarg; > int ch; > char *dir, *p; > int status; > Index: usr.sbin/npppctl/npppctl.c > =================================================================== > RCS file: /cvs/src/usr.sbin/npppctl/npppctl.c,v > retrieving revision 1.9 > diff -u -p -r1.9 npppctl.c > --- usr.sbin/npppctl/npppctl.c 28 Jun 2019 13:32:49 -0000 1.9 > +++ usr.sbin/npppctl/npppctl.c 15 Jul 2020 14:45:15 -0000 > @@ -80,8 +80,6 @@ main(int argc, char *argv[]) > struct parse_result *result; > struct sockaddr_un sun; > const char *npppd_ctlpath = NPPPD_SOCKET; > - extern int optind; > - extern char *optarg; > > while ((ch = getopt(argc, argv, "ns:")) != -1) > switch (ch) { > Index: usr.sbin/npppd/npppd/npppd.c > =================================================================== > RCS file: /cvs/src/usr.sbin/npppd/npppd/npppd.c,v > retrieving revision 1.50 > diff -u -p -r1.50 npppd.c > --- usr.sbin/npppd/npppd/npppd.c 10 May 2019 01:29:31 -0000 1.50 > +++ usr.sbin/npppd/npppd/npppd.c 15 Jul 2020 14:45:15 -0000 > @@ -136,7 +136,6 @@ int > main(int argc, char *argv[]) > { > int ch, stop_by_error, runasdaemon = 1, nflag = 0; > - extern char *optarg; > const char *npppd_conf0 = DEFAULT_NPPPD_CONF; > struct passwd *pw; > > Index: usr.sbin/pstat/pstat.c > =================================================================== > RCS file: /cvs/src/usr.sbin/pstat/pstat.c,v > retrieving revision 1.122 > diff -u -p -r1.122 pstat.c > --- usr.sbin/pstat/pstat.c 10 Jan 2020 10:33:35 -0000 1.122 > +++ usr.sbin/pstat/pstat.c 15 Jul 2020 14:45:15 -0000 > @@ -150,8 +150,6 @@ main(int argc, char *argv[]) > int fileflag = 0, swapflag = 0, ttyflag = 0, vnodeflag = 0, ch; > char buf[_POSIX2_LINE_MAX]; > const char *dformat = NULL; > - extern char *optarg; > - extern int optind; > int i; > > hideroot = getuid(); > Index: usr.sbin/quotaon/quotaon.c > =================================================================== > RCS file: /cvs/src/usr.sbin/quotaon/quotaon.c,v > retrieving revision 1.27 > diff -u -p -r1.27 quotaon.c > --- usr.sbin/quotaon/quotaon.c 26 Apr 2018 12:42:51 -0000 1.27 > +++ usr.sbin/quotaon/quotaon.c 15 Jul 2020 14:45:15 -0000 > @@ -66,7 +66,6 @@ main(int argc, char *argv[]) > char *qfnp, *whoami; > long argnum, done = 0; > int i, offmode = 0, errs = 0; > - extern int optind; > int ch; > > whoami = strrchr(*argv, '/') + 1; > Index: usr.sbin/rarpd/rarpd.c > =================================================================== > RCS file: /cvs/src/usr.sbin/rarpd/rarpd.c,v > retrieving revision 1.76 > diff -u -p -r1.76 rarpd.c > --- usr.sbin/rarpd/rarpd.c 28 Jun 2019 13:32:50 -0000 1.76 > +++ usr.sbin/rarpd/rarpd.c 15 Jul 2020 14:45:15 -0000 > @@ -103,7 +103,6 @@ int > main(int argc, char *argv[]) > { > extern char *__progname; > - extern int optind, opterr; > int op; > > /* All error reporting is done through syslogs. */ > Index: usr.sbin/rdate/rdate.c > =================================================================== > RCS file: /cvs/src/usr.sbin/rdate/rdate.c,v > retrieving revision 1.35 > diff -u -p -r1.35 rdate.c > --- usr.sbin/rdate/rdate.c 23 Dec 2015 19:13:52 -0000 1.35 > +++ usr.sbin/rdate/rdate.c 15 Jul 2020 14:45:15 -0000 > @@ -82,7 +82,6 @@ main(int argc, char **argv) > int pr = 0, silent = 0, ntp = 1, verbose = 0; > int slidetime = 0, corrleaps = 0; > char *hname; > - extern int optind; > int c, p[2], pid; > int family = PF_UNSPEC; > > Index: usr.sbin/repquota/repquota.c > =================================================================== > RCS file: /cvs/src/usr.sbin/repquota/repquota.c,v > retrieving revision 1.35 > diff -u -p -r1.35 repquota.c > --- usr.sbin/repquota/repquota.c 16 Mar 2016 15:41:11 -0000 1.35 > +++ usr.sbin/repquota/repquota.c 15 Jul 2020 14:45:15 -0000 > @@ -77,8 +77,6 @@ main(int argc, char *argv[]) > struct group *gr; > int gflag = 0, uflag = 0, errs = 0; > long i, argnum, done = 0; > - extern char *optarg; > - extern int optind; > char *qfnp; > int ch; > > Index: usr.sbin/rpc.bootparamd/bootparamd.c > =================================================================== > RCS file: /cvs/src/usr.sbin/rpc.bootparamd/bootparamd.c,v > retrieving revision 1.21 > diff -u -p -r1.21 bootparamd.c > --- usr.sbin/rpc.bootparamd/bootparamd.c 16 Oct 2016 10:40:58 -0000 > 1.21 > +++ usr.sbin/rpc.bootparamd/bootparamd.c 15 Jul 2020 14:45:15 -0000 > @@ -50,9 +50,6 @@ struct sockaddr_in my_addr; > extern char *__progname; > char *bootpfile = _PATH_BOOTPARAMS; > > -extern char *optarg; > -extern int optind; > - > static void > usage(void) > { > Index: usr.sbin/syslogc/syslogc.c > =================================================================== > RCS file: /cvs/src/usr.sbin/syslogc/syslogc.c,v > retrieving revision 1.18 > diff -u -p -r1.18 syslogc.c > --- usr.sbin/syslogc/syslogc.c 13 Oct 2015 16:30:55 -0000 1.18 > +++ usr.sbin/syslogc/syslogc.c 15 Jul 2020 14:45:15 -0000 > @@ -77,8 +77,6 @@ main(int argc, char **argv) > struct sockaddr_un ctl; > int ctlsock, ch, oflag, rval; > FILE *ctlf; > - extern char *optarg; > - extern int optind; > struct ctl_cmd cc; > struct ctl_reply_hdr rr; > const char *errstr; > Index: usr.sbin/yppoll/yppoll.c > =================================================================== > RCS file: /cvs/src/usr.sbin/yppoll/yppoll.c,v > retrieving revision 1.15 > diff -u -p -r1.15 yppoll.c > --- usr.sbin/yppoll/yppoll.c 16 Jan 2015 06:40:22 -0000 1.15 > +++ usr.sbin/yppoll/yppoll.c 15 Jul 2020 14:45:15 -0000 > @@ -126,8 +126,6 @@ int > main(int argc, char *argv[]) > { > char *domainname, *hostname = NULL, *inmap, *master; > - extern char *optarg; > - extern int optind; > int order, c, r; > time_t torder; > > Index: usr.sbin/ypserv/makedbm/makedbm.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ypserv/makedbm/makedbm.c,v > retrieving revision 1.33 > diff -u -p -r1.33 makedbm.c > --- usr.sbin/ypserv/makedbm/makedbm.c 9 Feb 2015 23:00:15 -0000 1.33 > +++ usr.sbin/ypserv/makedbm/makedbm.c 15 Jul 2020 14:45:15 -0000 > @@ -302,9 +302,6 @@ main(int argc, char *argv[]) > char *infile, *outfile; > int ch; > > - extern int optind; > - extern char *optarg; > - > yp_input_file = yp_output_file = NULL; > yp_master_name = yp_domain_name = NULL; > aflag = uflag = bflag = lflag = sflag = Uflag = 0; > Index: usr.sbin/ypserv/revnetgroup/revnetgroup.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ypserv/revnetgroup/revnetgroup.c,v > retrieving revision 1.11 > diff -u -p -r1.11 revnetgroup.c > --- usr.sbin/ypserv/revnetgroup/revnetgroup.c 5 Dec 2013 14:20:53 -0000 > 1.11 > +++ usr.sbin/ypserv/revnetgroup/revnetgroup.c 15 Jul 2020 14:45:15 -0000 > @@ -75,7 +75,6 @@ main(int argc, char *argv[]) > struct group_entry *gcur; > struct member_entry *mcur; > char *host, *user, *domain; > - extern char *optarg; > int ch; > char *key = NULL, *data = NULL; > int hosts = -1, i; > Index: usr.sbin/ypserv/yppush/yppush.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ypserv/yppush/yppush.c,v > retrieving revision 1.31 > diff -u -p -r1.31 yppush.c > --- usr.sbin/ypserv/yppush/yppush.c 16 Jan 2015 06:40:23 -0000 1.31 > +++ usr.sbin/ypserv/yppush/yppush.c 15 Jul 2020 14:45:15 -0000 > @@ -216,8 +216,6 @@ int > main(int argc, char *argv[]) > { > struct ypall_callback ypcb; > - extern char *optarg; > - extern int optind; > char *domain, *map, *hostname; > int c, r, i; > char *ypmap = "ypservers"; > Index: usr.sbin/ypserv/ypserv/ypserv.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ypserv/ypserv/ypserv.c,v > retrieving revision 1.44 > diff -u -p -r1.44 ypserv.c > --- usr.sbin/ypserv/ypserv/ypserv.c 17 Nov 2015 18:21:48 -0000 1.44 > +++ usr.sbin/ypserv/ypserv/ypserv.c 15 Jul 2020 14:45:15 -0000 > @@ -390,7 +390,6 @@ main(int argc, char *argv[]) > int xflag = 0, allowv1 = 0, ch, sock, proto; > struct sockaddr_in saddr; > socklen_t asize = sizeof(saddr); > - extern char *optarg; > SVCXPRT *transp = NULL; > > while ((ch = getopt(argc, argv, "1a:dx")) != -1) > Index: usr.sbin/ypserv/ypxfr/ypxfr.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ypserv/ypxfr/ypxfr.c,v > retrieving revision 1.39 > diff -u -p -r1.39 ypxfr.c > --- usr.sbin/ypserv/ypxfr/ypxfr.c 9 Feb 2015 23:00:15 -0000 1.39 > +++ usr.sbin/ypserv/ypxfr/ypxfr.c 15 Jul 2020 14:45:15 -0000 > @@ -350,7 +350,6 @@ main(int argc, char *argv[]) > u_int32_t ordernum, new_ordernum; > struct ypall_callback callback; > CLIENT *client = NULL; > - extern char *optarg; > > yp_get_default_domain(&domain); > > Index: usr.sbin/ypset/ypset.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ypset/ypset.c,v > retrieving revision 1.20 > diff -u -p -r1.20 ypset.c > --- usr.sbin/ypset/ypset.c 16 Jan 2015 06:40:23 -0000 1.20 > +++ usr.sbin/ypset/ypset.c 15 Jul 2020 14:45:15 -0000 > @@ -106,8 +106,6 @@ main(int argc, char *argv[]) > { > struct sockaddr_in sin; > struct hostent *hent; > - extern char *optarg; > - extern int optind; > char *domainname; > int c; > >
