From b38d4e1f74aaa91cd0de491e3b6bbe2de86a3963 Mon Sep 17 00:00:00 2001 From: Allanis Date: Thu, 16 May 2013 15:56:57 +0100 Subject: [PATCH] [Change] Minor cleanup in packfile. --- utils/pack/main.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/utils/pack/main.c b/utils/pack/main.c index 66d395c..5ad76c5 100644 --- a/utils/pack/main.c +++ b/utils/pack/main.c @@ -7,31 +7,32 @@ #define USAGE "Usage is: %s output input/s\n", argv[0] int main(int argc, char** argv) { - switch(argc) { - case 1: - fprintf(stderr, "Missing output file\n"); - goto usage; - break; - } - - char* outfile = argv[1]; - + char* packfile; char** list; uint32_t nlist; int i; - uint32_t nfiles = (uint32_t)argc - 2; + uint32_t nfiles; + + if(argc == 1) { + fprintf(stderr, "Missing output file\n"); + goto usage; + } + + packfile = argv[1]; + nfiles = (uint32_t)argc - 2; argv += 2; if(nfiles == 0) { // No files, list what it has. - fprintf(stdout, "Packfile '%s' contains:\n", outfile); + list = pack_listfiles(packfile, &nlist); + fprintf(stdout, "Packfile '%s' contains:\n", packfile); for(i = 0; i < nlist; i++) { - fprintf(stdout, " %03d) %s\n", i, list[i]); + fprintf(stdout, " %03d %s\n", i, list[i]); free(list[i]); } free(list); - } else { - pack_files(outfile, (const char**)argv, nfiles); + } else { // Create a packfile. + pack_files(packfile, (const char**)argv, nfiles); } exit(EXIT_SUCCESS);