cleaned up code for arguments a bit

This commit is contained in:
Paul Cruz
2017-07-07 10:58:43 -07:00
parent f7e6b358d0
commit 532f439961
2 changed files with 31 additions and 32 deletions
+28 -32
View File
@@ -515,39 +515,35 @@ int main(int argCount, const char* argv[])
const char* argument = argv[argNum]; const char* argument = argv[argNum];
/* output filename designated with "-o" */ /* output filename designated with "-o" */
if (argument[0]=='-') { if (argument[0]=='-' && strlen(argument) > 1) {
if (strlen(argument) > 1 && argument[1] == 'o') { switch (argument[1]) {
argument += 2; case 'o':
outFilename = argument; argument += 2;
continue; outFilename = argument;
} break;
else if (strlen(argument) > 1 && argument[1] == 'v') { case 'v':
g_displayLevel++; g_displayLevel++;
continue; break;
} case 'i':
else if (strlen(argument) > 1 && argument[1] == 'i') { argument += 2;
argument += 2; g_compressionLevel = readU32FromChar(&argument);
g_compressionLevel = readU32FromChar(&argument); DEBUGLOG(2, "g_compressionLevel: %u\n", g_compressionLevel);
DEBUGLOG(2, "g_compressionLevel: %u\n", g_compressionLevel); break;
continue; case 's':
} g_displayStats = 1;
else if (strlen(argument) > 1 && argument[1] == 's') { break;
g_displayStats = 1; case 'h':
continue; help();
} goto _main_exit;
else if (strlen(argument) > 1 && argument[1] == 'h') { case 'p':
help(); g_useProgressBar = 1;
return 0; break;
} default:
else if (strlen(argument) > 1 && argument[1] == 'p') { DISPLAY("Error: invalid argument provided\n");
g_useProgressBar = 1; ret = 1;
continue; goto _main_exit;
}
else {
DISPLAY("Error: invalid argument provided\n");
ret = 1;
goto _main_exit;
} }
continue;
} }
/* regular files to be compressed */ /* regular files to be compressed */
+3
View File
@@ -140,6 +140,9 @@ diff tests/test512.pdf tests/tmp512
diff tests/test1024.pdf tests/tmp1024 diff tests/test1024.pdf tests/tmp1024
diff tests/test2048.pdf tests/tmp2048 diff tests/test2048.pdf tests/tmp2048
echo "Running Args Tests"
./multi -h
./multi -i22 -p -s -otmp.zst tests/test2048.pdf
echo "finished with tests" echo "finished with tests"
make clean make clean