On Nov 23 00:10:08, [email protected] wrote:
> extern optind and friends are already declared
> once unistd.h is included, to these can be removed.
This is the same for usr.bin except ssh.
Jan
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 22 Nov 2021 23:27:39 -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 22 Nov 2021 23:27:39 -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 22 Nov 2021 23:27:39 -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 22 Nov 2021 23:27:39 -0000
@@ -326,13 +326,11 @@ 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 };
static int restartit = 0;
#ifndef SMALL
- extern char *optarg;
const char *errstr;
int ch, i = 1;
char type = 0, *dummyargv[] = { argv[0], ".", 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 22 Nov 2021 23:27:39 -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 22 Nov 2021 23:27:39 -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//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 22 Nov 2021 23:27:40 -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.121
diff -u -p -r1.121 main.c
--- usr.bin//netstat/main.c 26 Jan 2021 18:22:45 -0000 1.121
+++ usr.bin//netstat/main.c 22 Nov 2021 23:27:40 -0000
@@ -138,8 +138,6 @@ int af; /* address famil
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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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//systat/main.c
===================================================================
RCS file: /cvs/src/usr.bin/systat/main.c,v
retrieving revision 1.76
diff -u -p -r1.76 main.c
--- usr.bin//systat/main.c 12 Jul 2021 15:09:20 -0000 1.76
+++ usr.bin//systat/main.c 22 Nov 2021 23:27:40 -0000
@@ -465,8 +465,6 @@ main(int argc, char *argv[])
{
char errbuf[_POSIX2_LINE_MAX];
const char *errstr;
- extern char *optarg;
- extern int optind;
double delay = 5, del;
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 22 Nov 2021 23:27:40 -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 22 Nov 2021 23:27:40 -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//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 22 Nov 2021 23:27:40 -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.17
diff -u -p -r1.17 ypmatch.c
--- usr.bin//ypmatch/ypmatch.c 22 Jun 2021 20:14:25 -0000 1.17
+++ usr.bin//ypmatch/ypmatch.c 22 Nov 2021 23:27:40 -0000
@@ -69,8 +69,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;
