matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential issue with argument ordering

Browse Source
This commit is contained in:
Simon Robertshaw 2011-09-27 14:17:36 +01:00
parent d788b15068
commit a6e71ab3f5
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main.c
View File

@ -1643,6 +1643,29 @@ int main(int argc, char *argv[])
chdir(argv[i+1]);
i++;
}
else if (!strncmp(argv[i], "open", 4) && i+1<argc)
{
int size;
void *file_data;
file_data = file_load(argv[i+1], &size);
if (file_data)
{
svf_last = file_data;
svf_lsize = size;
if(!parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, signs, parts, pmap))
{
it=0;
svf_filename[0] = 0;
svf_fileopen = 1;
} else {
svf_last = NULL;
svf_lsize = 0;
free(file_data);
file_data = NULL;
}
}
i++;
}
}
@ -1688,40 +1711,10 @@ int main(int argc, char *argv[])
}
else if (!strncmp(argv[i], "open", 4) && i+1<argc)
{
int size;
void *file_data;
file_data = file_load(argv[i+1], &size);
if (file_data)
{
svf_last = file_data;
svf_lsize = size;
if(!parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, signs, parts, pmap))
{
it=0;
svf_filename[0] = 0;
svf_fileopen = 1;
} else {
svf_last = NULL;
svf_lsize = 0;
free(file_data);
file_data = NULL;
}
}
i++;
}
else if (!strncmp(argv[i], "ddir", 4) && i+1<argc)
{
/*char * temppath;
FILE *f;
temppath = malloc(strlen(argv[i+1])+19);
sprintf(temppath, "%s%s%s", argv[i+1], PATH_SEP, "powdertoydir.test")
f = fopen(temppath, "wb");
if(f){
chdir(argv[i+1]);
fclose(f);
remove(temppath);
}
free(temppath);*/
i++;
}