author | ecalot
<ecalot> 2005-06-15 00:06:42 UTC |
committer | ecalot
<ecalot> 2005-06-15 00:06:42 UTC |
parent | 120c6e78966a683f0f770e108943f9778e1e6f6e |
PR/doc/changelog.txt | +3 | -4 |
PR/src/console/filedir.c | +7 | -7 |
PR/src/console/main.c | +2 | -2 |
PR/src/include/common.h | +1 | -1 |
diff --git a/PR/doc/changelog.txt b/PR/doc/changelog.txt index e09057a..e01cd7b 100644 --- a/PR/doc/changelog.txt +++ b/PR/doc/changelog.txt @@ -12,6 +12,7 @@ Legend: - Code improvement Things that were supported before, but they have been improved Code bug fixes + x Not coded, but scheduled Versions: * PG (unreleased) @@ -144,7 +145,7 @@ Versions: - Solved bug in palette buffer initialization for autodetected images - Stable version for win32 and unix based systems - Using new macros to use an endian-independent layer. - * PR v1.1 (next week) + * PR v1.1 (2005-06-15) - Added pop2 palette support - Centralize all the return values in defines - Coded file type detection to detect dat subtypes, sav, hof and exe @@ -162,10 +163,8 @@ Versions: x Add pop2 importing x Add pop2 to resources.xml x Finish python interface + x Fix buffer overflows x Fix the language support - -2) ToDo List & Future Plans: - * PR v2.0 beta x Add full pop2 support * PR v2.0 diff --git a/PR/src/console/filedir.c b/PR/src/console/filedir.c index 3d67d73..f65b37c 100644 --- a/PR/src/console/filedir.c +++ b/PR/src/console/filedir.c @@ -133,7 +133,7 @@ int listAllDatFiles(const char* vResFile, const char* directory, const char* opt tPassListAndDir pass; tTag* structure; int error; - + pass.dir=directory; pass.opt=opt; pass.list=list; @@ -165,7 +165,7 @@ int isADatFile(const char* vResFile, const char* file) { tPassFileAndResult pass; tTag* structure; int error; - + pass.file=getFileNameFromPath(file); pass.result=0; @@ -191,11 +191,11 @@ int fileDirGetFilesImport(tFileDir2* list1,tFileDir2* files,const char* resfile, files->filenames=NULL; files->options=NULL; - + while ((file=filedir_pop(&(list1->filenames)))) { opt=filedir_pop(&(list1->options)); type=isDir(file); - + /* a not found file may become either a directory or a file depending on the res file */ if (type==eNotFound) { /* first check if the dat type was given by the -t option */ @@ -213,7 +213,7 @@ int fileDirGetFilesImport(tFileDir2* list1,tFileDir2* files,const char* resfile, } } } - + if ((!dirs)&&type==eDirectory) { parseError=listAllDatFiles(resfile, file, opt, files); } @@ -315,7 +315,7 @@ void fileDirAddOption(tFileDir2* list1, const char* option) { int fileDirGetFiles(tFileDir2* list1,tFileDir2* files,int hasExportFlag,int notHasRecursiveFlag,const char* resfile,int given) { /* case 1: * import from more than one directory */ - + if (!hasExportFlag&&!notHasRecursiveFlag) { char* file; while ((file=filedir_pop(&(list1->filenames)))) { @@ -329,7 +329,7 @@ int fileDirGetFiles(tFileDir2* list1,tFileDir2* files,int hasExportFlag,int notH return fileDirGetFilesExport(list1,files,notHasRecursiveFlag); else return fileDirGetFilesImport(list1,files,resfile,given); - + } char* fileDirGetFile(tFileDir2* files, char** datfile) { diff --git a/PR/src/console/main.c b/PR/src/console/main.c index 239aea5..5be93d1 100644 --- a/PR/src/console/main.c +++ b/PR/src/console/main.c @@ -143,7 +143,7 @@ int main (int argc, char **argv) { outputStream=stdout; c=0; - + /* At least one of these options must be selected, if not, the user needs help! */ if (!(hasFlag(import_flag|export_flag|classify_flag))) setFlag(help_flag); @@ -162,7 +162,7 @@ int main (int argc, char **argv) { } else { tFileDir2 files; tFileDir2 input; - + fileDirClearOptions(&input); if (optind < argc) { while (optind < argc) diff --git a/PR/src/include/common.h b/PR/src/include/common.h index 24a1cd3..a540d70 100644 --- a/PR/src/include/common.h +++ b/PR/src/include/common.h @@ -130,7 +130,7 @@ common.h: Princed Resources : Defines and prototypes common to all PR code #else #define PARSING_OPTRAW , #define PARSING_CHRRAW "" -#define PARSING_SHOWRAW(a) "" +#define PARSING_SHOWRAW(a) "" #endif #define PARSING_OPTIONS {\ {"import", optional_argument, 0,'m'},\