X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Foptions.c;h=8bf7945a4b7f95a671310c788ef115f9bda961c4;hb=03dccce903176e61f889b1558834aa5a09f9f8c0;hp=d0811a97731a708262e59a7c83476aee19e5d665;hpb=3b048412a86f31a520c83d8604569c88ec9cbbf6;p=yaz-moved-to-github.git

diff --git a/src/options.c b/src/options.c
index d0811a9..8bf7945 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -16,6 +16,7 @@
 
 static int arg_no = 1;
 static size_t arg_off = 0;
+static int eof_options = 0;
 
 int options(const char *desc, char **argv, int argc, char **arg)
 {
@@ -33,15 +34,26 @@ int options(const char *desc, char **argv, int argc, char **arg)
             if (arg_no >= argc)
                 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 - */
     }
+    /* we're in option mode */
     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]);
     }