summaryrefslogtreecommitdiffstats
path: root/bin/sh/miscbltin.c
diff options
context:
space:
mode:
authorcracauer <cracauer@FreeBSD.org>2000-04-20 09:49:16 +0000
committercracauer <cracauer@FreeBSD.org>2000-04-20 09:49:16 +0000
commit72606bd24b5a939819d9dadc84fc7ec891cff643 (patch)
tree077ee4ffbe0c4417f9d91cded1a1d7cc7b74be7a /bin/sh/miscbltin.c
parent582b546eb7cf75ea34c125f7893cf78079c7a160 (diff)
downloadFreeBSD-src-72606bd24b5a939819d9dadc84fc7ec891cff643.zip
FreeBSD-src-72606bd24b5a939819d9dadc84fc7ec891cff643.tar.gz
Fix warnings, some of them serious because sh violated name
spaces reserved by the header files it includes. mkinit.c still produces C code with redundant declarations, although they are more harmless since they automatically derived from the right places.
Diffstat (limited to 'bin/sh/miscbltin.c')
-rw-r--r--bin/sh/miscbltin.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index bb602f6..46d3950 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -67,9 +67,6 @@ static const char rcsid[] =
#undef eflag
-extern char **argptr; /* argument list for builtin command */
-
-
/*
* The read builtin. The -r option causes backslashes to be treated like
* ordinary characters.
@@ -105,7 +102,7 @@ readcmd(argc, argv)
while ((i = nextopt("erp:t:")) != '\0') {
switch(i) {
case 'p':
- prompt = optarg;
+ prompt = shoptarg;
break;
case 'e':
break;
@@ -113,8 +110,8 @@ readcmd(argc, argv)
rflag = 1;
break;
case 't':
- tv.tv_sec = strtol(optarg, &tvptr, 0);
- if (tvptr == optarg)
+ tv.tv_sec = strtol(shoptarg, &tvptr, 0);
+ if (tvptr == shoptarg)
error("timeout value");
switch(*tvptr) {
case 0:
OpenPOWER on IntegriCloud