From 0867c77077b4108045752e5cb406fb7449e2b01a Mon Sep 17 00:00:00 2001 From: nishi Date: Sun, 26 May 2024 07:14:28 +0000 Subject: [PATCH] use slash instaed of dash for option on dos/windows git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@113 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- Client/main.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/Client/main.c b/Client/main.c index 1993d53..3b3c3a9 100644 --- a/Client/main.c +++ b/Client/main.c @@ -43,6 +43,16 @@ HANDLE winstdout; #endif +#if defined(__WATCOMC__) || defined(__MINGW32__) +#define LONGOPT_PREFIX "/" +#define SHORTOPT_PREFIX "/" +#define OPT_CHAR '/' +#else +#define LONGOPT_PREFIX "--" +#define SHORTOPT_PREFIX "-" +#define OPT_CHAR '-' +#endif + void padleft(int leftpad, const char* str) { char* spaces = malloc(leftpad - strlen(str) + 1); memset(spaces, ' ', leftpad - strlen(str)); @@ -60,22 +70,22 @@ int main(int argc, char** argv) { const char* fname = NULL; const char* fprog = NULL; for(i = 1; i < argc; i++) { - if(argv[i][0] == '-') { - if(strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "-V") == 0) { + if(argv[i][0] == OPT_CHAR) { + if(__dw_strcaseequ(argv[i], LONGOPT_PREFIX "version") || strcmp(argv[i], SHORTOPT_PREFIX "V") == 0) { printf("DataWorks version %s %s %s\n", dataworks_get_version(), dataworks_get_compile_date(), dataworks_get_platform()); return 0; - } else if(strcmp(argv[i], "--create") == 0 || strcmp(argv[i], "-C") == 0) { + } else if(__dw_strcaseequ(argv[i], LONGOPT_PREFIX "create") || strcmp(argv[i], SHORTOPT_PREFIX "C") == 0) { create = true; - } else if(strcmp(argv[i], "--noclear") == 0 || strcmp(argv[i], "-NC") == 0) { + } else if(__dw_strcaseequ(argv[i], LONGOPT_PREFIX "noclear") || strcmp(argv[i], SHORTOPT_PREFIX "NC") == 0) { clear = false; - } else if(strcmp(argv[i], "--quiet") == 0 || strcmp(argv[i], "-q") == 0) { + } else if(__dw_strcaseequ(argv[i], LONGOPT_PREFIX "quiet") || strcmp(argv[i], SHORTOPT_PREFIX "q") == 0) { banner = false; log = false; - } else if(strcmp(argv[i], "--nobanner") == 0 || strcmp(argv[i], "-NB") == 0) { + } else if(__dw_strcaseequ(argv[i], LONGOPT_PREFIX "nobanner") || strcmp(argv[i], SHORTOPT_PREFIX "NB") == 0) { banner = false; - } else if(strcmp(argv[i], "--nolog") == 0 || strcmp(argv[i], "-NL") == 0) { + } else if(__dw_strcaseequ(argv[i], LONGOPT_PREFIX "nolog") || strcmp(argv[i], SHORTOPT_PREFIX "NL") == 0) { log = false; - } else if(strcmp(argv[i], "-f") == 0) { + } else if(strcmp(argv[i], SHORTOPT_PREFIX "f") == 0) { fprog = argv[i + 1]; i++; } else { -- 2.43.0