aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/make/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/make/main.c')
-rw-r--r--usr.bin/make/main.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index ad20f329e254..1d65ffb88450 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -575,8 +575,7 @@ rearg:
void
Main_ParseArgLine(char *line, int mflags)
{
- char **argv; /* Manufactured argument vector */
- int argc; /* Number of arguments in argv */
+ ArgArray aa;
if (line == NULL)
return;
@@ -586,11 +585,12 @@ Main_ParseArgLine(char *line, int mflags)
return;
if (mflags)
- argv = MAKEFLAGS_break(line, &argc);
+ MAKEFLAGS_break(&aa, line);
else
- argv = brk_string(line, &argc, TRUE);
+ brk_string(&aa, line, TRUE);
- MainParseArgs(argc, argv);
+ MainParseArgs(aa.argc, aa.argv);
+ ArgArray_Done(&aa);
}
static char *
@@ -785,8 +785,6 @@ main(int argc, char **argv)
* can be processed correctly */
Var_Init(environ); /* As well as the lists of variables for
* parsing arguments */
- str_init();
-
/*
* Initialize various variables.
* MAKE also gets this name, for compatibility