X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Foptions.c;h=0c7aa81b1feecbe5455f4da87aeb50a4a22e6362;hb=33ec719e54ba8b5cc86c7745ebcbcfa572eb3e0d;hp=ebe1b93d690554290941953d1f0c5908673b3a33;hpb=f26c147b7e348a8e0b91364f4a4d100dc1832467;p=yaz-moved-to-github.git diff --git a/util/options.c b/util/options.c index ebe1b93..0c7aa81 100644 --- a/util/options.c +++ b/util/options.c @@ -1,10 +1,26 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: options.c,v $ - * Revision 1.1 1995-03-27 08:35:18 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 + * License, documentation, and memory fixes + * + * Revision 1.1 1995/03/27 08:35:18 quinn * Created util library * Added memory debugging module. Imported options-manager * @@ -30,7 +46,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;