X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fgetarguments.c;h=e8da9849b8eaad0b25b63068c721f97d080a8996;hp=5dbdf56896df940ab363eca8d0441afc01139037;hb=31750e8a12eafcd1b8fa81cb12b988e680254f24;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/sbr/getarguments.c b/sbr/getarguments.c index 5dbdf56..e8da984 100644 --- a/sbr/getarguments.c +++ b/sbr/getarguments.c @@ -10,7 +10,7 @@ #include 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; @@ -18,9 +18,9 @@ getarguments (char *invo_name, int argc, char **argv, int check_context) /* ** 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; @@ -28,14 +28,14 @@ getarguments (char *invo_name, int argc, char **argv, int check_context) 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++;