empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #202 from greg-king5/argv-null

Browse source 
Fix the preparation of tool command lines.
This commit is contained in:
Oliver Schmidt 2015-08-31 17:34:28 +02:00
commit 1ee57eeea4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/cmdline.c
View file

@ -161,7 +161,7 @@ static void ExpandFile (CmdLine* L, const char* Name)
void InitCmdLine (int* aArgCount, char** aArgVec[], const char* aProgName) void InitCmdLine (int* aArgCount, char*** aArgVec, const char* aProgName)
/* Initialize command line parsing. aArgVec is the argument array terminated by /* Initialize command line parsing. aArgVec is the argument array terminated by
** a NULL pointer (as usual), ArgCount is the number of valid arguments in the ** a NULL pointer (as usual), ArgCount is the number of valid arguments in the
** array. Both arguments are remembered in static storage. ** array. Both arguments are remembered in static storage.
@ -171,7 +171,7 @@ void InitCmdLine (int* aArgCount, char** aArgVec[], const char* aProgName)
int I; int I;
/* Get the program name from argv[0] but strip a path */ /* Get the program name from argv[0] but strip a path */
if (*(aArgVec)[0] == 0) { if ((*aArgVec)[0] == 0) {
/* Use the default name given */ /* Use the default name given */
ProgName = aProgName; ProgName = aProgName;
} else { } else {
@ -190,7 +190,7 @@ void InitCmdLine (int* aArgCount, char** aArgVec[], const char* aProgName)
** special handling for arguments preceeded by the '@' sign - these are ** special handling for arguments preceeded by the '@' sign - these are
** actually files containing arguments. ** actually files containing arguments.
*/ */
for (I = 0; I < *aArgCount; ++I) { for (I = 0; I <= *aArgCount; ++I) {
/* Get the next argument */ /* Get the next argument */
char* Arg = (*aArgVec)[I]; char* Arg = (*aArgVec)[I];
@ -210,11 +210,11 @@ void InitCmdLine (int* aArgCount, char** aArgVec[], const char* aProgName)
} }
/* Store the new argument list in a safe place... */ /* Store the new argument list in a safe place... */
ArgCount = L.Count; ArgCount = L.Count - 1;
ArgVec = L.Vec; ArgVec = L.Vec;
/* ...and pass back the changed data also */ /* ...and pass back the changed data also */
*aArgCount = L.Count; *aArgCount = L.Count - 1;
*aArgVec = L.Vec; *aArgVec = L.Vec;
} }

2
src/common/cmdline.h
View file

@ -71,7 +71,7 @@ struct LongOpt {
void InitCmdLine (int* aArgCount, char** aArgVec[], const char* aProgName); void InitCmdLine (int* aArgCount, char*** aArgVec, const char* aProgName);
/* Initialize command line parsing. aArgVec is the argument array terminated by /* Initialize command line parsing. aArgVec is the argument array terminated by
** a NULL pointer (as usual), ArgCount is the number of valid arguments in the ** a NULL pointer (as usual), ArgCount is the number of valid arguments in the
** array. Both arguments are remembered in static storage. ** array. Both arguments are remembered in static storage.