X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Foptions.c;h=0c7aa81b1feecbe5455f4da87aeb50a4a22e6362;hp=6246b23e7d5a81726d482849174abff42329c64f;hb=eb0f67241481fb645a377b1c5df9683f8f1bd2fb;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4 diff --git a/util/options.c b/util/options.c index 6246b23..0c7aa81 100644 --- a/util/options.c +++ b/util/options.c @@ -4,7 +4,17 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: options.c,v $ - * Revision 1.3 1995-09-27 15:03:03 quinn + * Revision 1.6 1997-09-01 08:54:13 adam + * New windows NT/95 port using MSV5.0. Made prefix query handling + * thread safe. The function options ignores empty arguments when met. + * + * Revision 1.5 1995/12/06 13:00:19 adam + * Minus alone not treated as an option. + * + * Revision 1.4 1995/09/29 17:12:35 quinn + * Smallish + * + * Revision 1.3 1995/09/27 15:03:03 quinn * Modified function heads & prototypes. * * Revision 1.2 1995/05/16 08:51:13 quinn @@ -28,7 +38,7 @@ static int arg_no = 1; static int arg_off = 0; -int MDF options (const char *desc, char **argv, int argc, char **arg) +int options (const char *desc, char **argv, int argc, char **arg) { int ch, i = 0; @@ -36,7 +46,13 @@ int MDF options (const char *desc, char **argv, int argc, char **arg) return -2; if (arg_off == 0) { - if (argv[arg_no][0] != '-') + while (argv[arg_no][0] == '\0') + { + arg_no++; + if (arg_no >= argc) + return -2; + } + if (argv[arg_no][0] != '-' || argv[arg_no][1] == '\0') { *arg = argv[arg_no++]; return 0;