Cosmetic

[yaz-moved-to-github.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 4f86d83..11dc8db 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* 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.2 2004-10-15 00:19:00 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,52 +38,77 @@ 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 */
+        {       /* 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
-               {
+                {
                     arg_no++;
                     arg_off = 0;
                     if (arg_no < argc)
                         *arg = argv[arg_no++];
                     else
                         *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++;
-               }
-           }
+                }
+            }
             return ch;
-       }               
+        }               
     }
     *arg = argv[arg_no]+arg_off-1;
     arg_no = arg_no + 1;
     arg_off = 0;
     return -1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+