Commit 5bb94866 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Args.c: simplify options string allocation

parent 0755f3d6
...@@ -277,32 +277,18 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -277,32 +277,18 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{ {
if ((!strcmp(argv[j], "-options") || !strcmp(argv[j], "-option")) && j + 1 < argc) if ((!strcmp(argv[j], "-options") || !strcmp(argv[j], "-option")) && j + 1 < argc)
{ {
if (nxagentOptionsFilenameOrString) SAFE_free(nxagentOptionsFilenameOrString);
{
nxagentOptionsFilenameOrString = (char *) realloc(nxagentOptionsFilenameOrString, strlen(argv[j + 1]) + 1);
}
else
{
nxagentOptionsFilenameOrString = (char *) malloc(strlen(argv[j + 1]) +1);
}
if (nxagentOptionsFilenameOrString != NULL) if (-1 == asprintf(&nxagentOptionsFilenameOrString, "%s", argv[j + 1]))
{ {
nxagentOptionsFilenameOrString = strcpy(nxagentOptionsFilenameOrString, argv[j + 1]); FatalError("malloc failed");
} }
#ifdef WARNING
else
{
fprintf(stderr, "ddxProcessArgument: WARNING! failed string allocation.\n");
}
#endif
break; break;
} }
} }
nxagentProcessOptions(nxagentOptionsFilenameOrString); nxagentProcessOptions(nxagentOptionsFilenameOrString);
} } /* if (resetOptions == True) */
if (!strcmp(argv[i], "-B")) if (!strcmp(argv[i], "-B"))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment