summaryrefslogtreecommitdiffstats
path: root/bin/sh/options.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/options.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/options.c')
-rw-r--r--bin/sh/options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 2bd55f5..36f9c5c 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -67,7 +67,7 @@ static const char rcsid[] =
char *arg0; /* value of $0 */
struct shparam shellparam; /* current positional parameters */
char **argptr; /* argument list for builtin commands */
-char *optarg; /* set by nextopt (like getopt) */
+char *shoptarg; /* set by nextopt (like getopt) */
char *optptr; /* used by nextopt */
char *minusc; /* argument to -c option */
@@ -539,7 +539,7 @@ nextopt(optstring)
if (*++q == ':') {
if (*p == '\0' && (p = *argptr++) == NULL)
error("No arg for -%c option", c);
- optarg = p;
+ shoptarg = p;
p = NULL;
}
optptr = p;
OpenPOWER on IntegriCloud