X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fgetarguments.c;h=e8da9849b8eaad0b25b63068c721f97d080a8996;hp=d133e0680d152df88ddf2c983cce44e4b4c123be;hb=431604647f89d5aac7b199a7883e98e56e4ccf9e;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1 diff --git a/sbr/getarguments.c b/sbr/getarguments.c index d133e06..e8da984 100644 --- a/sbr/getarguments.c +++ b/sbr/getarguments.c @@ -1,26 +1,26 @@ /* - * getarguments.c -- Get the argument vector ready to go. - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** getarguments.c -- Get the argument vector ready to go. +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #include #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; /* - * 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 */ + ** Check if profile/context specifies any arguments + */ + 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++;