X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Foptions.c;h=88c1c925c5c9dcaf9d19505ebe56f9fe5dd4b06d;hp=47dd4337e57382bef58cf8a6663d0e23aa76d129;hb=0edd22d3d3fb9bafa8795815517e9ad51d51641f;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/src/options.c b/src/options.c
index 47dd433..88c1c92 100644
--- 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) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: options.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file options.c
@@ -13,7 +11,7 @@
 #endif
 
 #include <stdlib.h>
-
+#include <string.h>
 #include <yaz/options.h>
 
 static int arg_no = 1;
@@ -21,7 +19,9 @@ static int arg_off = 0;
 
 int options (const char *desc, char **argv, int argc, char **arg)
 {
-    int ch, i = 0;
+    const char *opt_buf = 0;
+    size_t i = 0;
+    int ch = 0;
     
     if (arg_no >= argc)
         return -2;
@@ -38,26 +38,45 @@ int options (const char *desc, char **argv, int argc, char **arg)
             *arg = argv[arg_no++];
             return 0;
         }
-        arg_off++;
+        arg_off++; /* skip - */
+    }
+    if (argv[arg_no][1] == '-')
+    {   /* long opt */
+        opt_buf = argv[arg_no]+2;
+        arg_off = strlen(argv[arg_no]);
+    }
+    else
+    {   /* single char opt */
+        ch = argv[arg_no][arg_off++];
     }
-    ch = argv[arg_no][arg_off++];
     while (desc[i])
     {
         int desc_char = desc[i++];
         int type = 0;
+        while (desc[i] == '{')
+        {
+            size_t i0 = ++i;
+            while (desc[i] && desc[i] != '}')
+                i++;
+            if (opt_buf && (i - i0) == strlen(opt_buf) &&
+                memcmp(opt_buf, desc+i0, i - i0) == 0)
+                ch = desc_char;
+            if (desc[i])
+                i++;
+        }
         if (desc[i] == ':')
-        {       /* string argument */
-            type = desc[i++];
+        {       /* option with string argument */
+                type = desc[i++];
         }
         if (desc_char == ch)
-        { /* option with argument */
-            if (type)
+        { 
+            if (type) /* option with argument */
             {
                 if (argv[arg_no][arg_off])
                 {
                     *arg = argv[arg_no]+arg_off;
                     arg_no++;
-                    arg_off =  0;
+                    arg_off = 0;
                 }
                 else
                 {
@@ -71,9 +90,7 @@ int options (const char *desc, char **argv, int argc, char **arg)
             }
             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++;