(construct_command): handle argc == 0 for generality
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6389 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -476,6 +476,7 @@ construct_command (char **res, int argc, char **argv)
|
|||||||
|
|
||||||
for (i = 0; i < argc; ++i)
|
for (i = 0; i < argc; ++i)
|
||||||
len += strlen(argv[i]) + 1;
|
len += strlen(argv[i]) + 1;
|
||||||
|
len = max (1, len);
|
||||||
tmp = malloc (len);
|
tmp = malloc (len);
|
||||||
if (tmp == NULL)
|
if (tmp == NULL)
|
||||||
errx (1, "malloc %u failed", len);
|
errx (1, "malloc %u failed", len);
|
||||||
@@ -485,7 +486,8 @@ construct_command (char **res, int argc, char **argv)
|
|||||||
strcat (tmp, argv[i]);
|
strcat (tmp, argv[i]);
|
||||||
strcat (tmp, " ");
|
strcat (tmp, " ");
|
||||||
}
|
}
|
||||||
strcat (tmp, argv[argc-1]);
|
if (argc > 0)
|
||||||
|
strcat (tmp, argv[argc-1]);
|
||||||
*res = tmp;
|
*res = tmp;
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user