#include <h/utils.h>
char **
-getarguments (char *invo_name, int argc, char **argv, int check_context)
+getarguments(char *invo_name, int argc, char **argv, int check_context)
{
char *cp = NULL, **ap = NULL, **bp = NULL, **arguments = NULL;
int n = 0;
/*
** Check if profile/context specifies any arguments
*/
- if (check_context && (cp = context_find (invo_name))) {
- cp = getcpy (cp); /* make copy */
- ap = brkstring (cp, " ", "\n"); /* split string */
+ if (check_context && (cp = context_find(invo_name))) {
+ cp = mh_xstrdup(cp); /* make copy */
+ ap = brkstring(cp, " ", "\n"); /* split string */
/* Count number of arguments split */
bp = ap;
n++;
}
- arguments = (char **) mh_xmalloc ((argc + n) * sizeof(*arguments));
+ arguments = mh_xcalloc(argc + n, sizeof(*arguments));
bp = arguments;
/* Copy any arguments from profile/context */
if (ap != NULL && n > 0) {
while (*ap)
*bp++ = *ap++;
- }
+ }
/* Copy arguments from command line */
argv++;