projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Windows: one NSI file again YAZ-848
[yaz-moved-to-github.git]
/
src
/
options.c
diff --git
a/src/options.c
b/src/options.c
index
3125735
..
6abfb6f
100644
(file)
--- a/
src/options.c
+++ b/
src/options.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: options.c,v 1.6 2008-02-19 19:58:40 adam Exp $
*/
/**
* \file options.c
*/
/**
* \file options.c
@@
-17,33
+15,45
@@
#include <yaz/options.h>
static int arg_no = 1;
#include <yaz/options.h>
static int arg_no = 1;
-static int arg_off = 0;
+static size_t arg_off = 0;
+static int eof_options = 0;
-int options (const char *desc, char **argv, int argc, char **arg)
+int options(const char *desc, char **argv, int argc, char **arg)
{
const char *opt_buf = 0;
{
const char *opt_buf = 0;
- int i = 0;
+ size_t i = 0;
int ch = 0;
int ch = 0;
-
+
if (arg_no >= argc)
if (arg_no >= argc)
- return -2;
+ return YAZ_OPTIONS_EOF;
if (arg_off == 0)
{
while (argv[arg_no][0] == '\0')
{
arg_no++;
if (arg_no >= argc)
if (arg_off == 0)
{
while (argv[arg_no][0] == '\0')
{
arg_no++;
if (arg_no >= argc)
- return -2;
+ return YAZ_OPTIONS_EOF;
}
}
- if (argv[arg_no][0] != '-' || argv[arg_no][1] == '\0')
+ if (argv[arg_no][0] != '-' || argv[arg_no][1] == '\0' || eof_options)
{
*arg = argv[arg_no++];
return 0;
}
arg_off++; /* skip - */
}
{
*arg = argv[arg_no++];
return 0;
}
arg_off++; /* skip - */
}
+ /* we're in option mode */
if (argv[arg_no][1] == '-')
{ /* long opt */
if (argv[arg_no][1] == '-')
{ /* long opt */
+ if (argv[arg_no][2] == '\0') /* -- : end of options */
+ {
+ eof_options = 1;
+ arg_off = 0;
+ ++arg_no;
+ if (arg_no >= argc)
+ return YAZ_OPTIONS_EOF;
+ *arg = argv[arg_no++];
+ return 0;
+ }
opt_buf = argv[arg_no]+2;
arg_off = strlen(argv[arg_no]);
}
opt_buf = argv[arg_no]+2;
arg_off = strlen(argv[arg_no]);
}
@@
-57,7
+67,7
@@
int options (const char *desc, char **argv, int argc, char **arg)
int type = 0;
while (desc[i] == '{')
{
int type = 0;
while (desc[i] == '{')
{
- int i0 = ++i;
+ size_t i0 = ++i;
while (desc[i] && desc[i] != '}')
i++;
if (opt_buf && (i - i0) == strlen(opt_buf) &&
while (desc[i] && desc[i] != '}')
i++;
if (opt_buf && (i - i0) == strlen(opt_buf) &&
@@
-67,11
+77,11
@@
int options (const char *desc, char **argv, int argc, char **arg)
i++;
}
if (desc[i] == ':')
i++;
}
if (desc[i] == ':')
- { /* string argument */
- type = desc[i++];
+ { /* option with string argument */
+ type = desc[i++];
}
if (desc_char == ch)
}
if (desc_char == ch)
- {
+ {
if (type) /* option with argument */
{
if (argv[arg_no][arg_off])
if (type) /* option with argument */
{
if (argv[arg_no][arg_off])
@@
-92,25
+102,24
@@
int options (const char *desc, char **argv, int argc, char **arg)
}
else /* option with no argument */
{
}
else /* option with no argument */
{
- if (argv[arg_no][arg_off])
- arg_off++;
- else
+ if (!argv[arg_no][arg_off])
{
arg_off = 0;
arg_no++;
}
}
return ch;
{
arg_off = 0;
arg_no++;
}
}
return ch;
- }
+ }
}
*arg = argv[arg_no]+arg_off-1;
arg_no = arg_no + 1;
arg_off = 0;
}
*arg = argv[arg_no]+arg_off-1;
arg_no = arg_no + 1;
arg_off = 0;
- return -1;
+ return YAZ_OPTIONS_ERROR;
}
/*
* Local variables:
* c-basic-offset: 4
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab