make work

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24368 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-25 00:32:40 +00:00
parent 28e8803c86
commit 86a97737e3

View File

@@ -96,6 +96,8 @@ main(int argc, char **argv)
const char *file; const char *file;
const char *name = NULL; const char *name = NULL;
int optidx = 0; int optidx = 0;
char **arg = NULL;
size_t len, i;
setprogname(argv[0]); setprogname(argv[0]);
if(getarg(args, num_args, argc, argv, &optidx)) if(getarg(args, num_args, argc, argv, &optidx))
@@ -129,8 +131,6 @@ main(int argc, char **argv)
* Parse extra options file * Parse extra options file
*/ */
if (option_file) { if (option_file) {
char **arg = NULL;
size_t len, i;
char buf[1024]; char buf[1024];
FILE *opt; FILE *opt;
@@ -153,12 +153,13 @@ main(int argc, char **argv)
perror("malloc"); perror("malloc");
exit(1); exit(1);
} }
arg[i] = strdup(buf); arg[len] = strdup(buf);
if (arg[i] == NULL) { if (arg[len] == NULL) {
perror("strdup"); perror("strdup");
exit(1); exit(1);
} }
arg[i + 1] = NULL; arg[len + 1] = NULL;
len++;
} }
fclose(opt); fclose(opt);
@@ -170,10 +171,6 @@ main(int argc, char **argv)
fprintf(stderr, "extra args"); fprintf(stderr, "extra args");
exit(1); exit(1);
} }
for (i = 1; i < len; i++)
free(arg[i]);
free(arg);
} }
@@ -193,5 +190,11 @@ main(int argc, char **argv)
if (one_code_file) if (one_code_file)
close_codefile(); close_codefile();
if (arg) {
for (i = 1; i < len; i++)
free(arg[i]);
free(arg);
}
return 0; return 0;
} }