X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Foptions.c;h=5c7f2946574c1c5916b36774c9bc1dbeb0bf3d78;hb=62bcf7a811cd3151ac10f93317c9ddfa6b16f539;hp=8a69e6c006c40c2f937468b143abfaa330ad1be0;hpb=99268f722648e84bf5c54eb685a1434e100f38a1;p=yaz-moved-to-github.git diff --git a/util/options.c b/util/options.c index 8a69e6c..5c7f294 100644 --- a/util/options.c +++ b/util/options.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: options.c,v $ - * Revision 1.2 1995-05-16 08:51:13 quinn + * Revision 1.7 1999-11-30 13:47:12 adam + * Improved installation. Moved header files to include/yaz. + * + * 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 * License, documentation, and memory fixes * * Revision 1.1 1995/03/27 08:35:18 quinn @@ -20,7 +36,7 @@ */ #include -#include +#include static int arg_no = 1; static int arg_off = 0; @@ -33,7 +49,13 @@ int 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;