From 45a927f17e07369aa55e6c4971429e369eb2d103 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 11 Jan 2002 20:17:03 +0000
Subject: [PATCH] Towards 1.8.5. Option -u for YAZ client.

---
 CHANGELOG                 |    4 ++++
 client/client.c           |   29 +++++++++++++++++++++++++----
 configure.in              |    4 ++--
 debian/rules              |    2 +-
 include/yaz/yaz-version.h |    4 ++--
 win/yaz.rc                |    4 ++--
 yaz.spec                  |    2 +-
 7 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0e3c5f6..e43e483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 1.8.5 2002/XX/XX
+
+New option for YAZ client, -u <auth>, that sets authentication.
+
 ZOOM fix: error information only cleared for Bib-diagnostics (not
 fatal errors, like connection failed, etc).
 
diff --git a/client/client.c b/client/client.c
index 1761183..fe41beb 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2001, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.133 2001-11-22 11:04:48 adam Exp $
+ * $Id: client.c,v 1.134 2002-01-11 20:17:03 adam Exp $
  */
 
 #include <stdio.h>
@@ -2221,10 +2221,11 @@ int main(int argc, char **argv)
 {
     char *prog = *argv;
     char *open_command = 0;
+    char *auth_command = 0;
     char *arg;
     int ret;
 
-    while ((ret = options("c:a:m:v:p:", argv, argc, &arg)) != -2)
+    while ((ret = options("c:a:m:v:p:u:", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -2256,17 +2257,37 @@ int main(int argc, char **argv)
 	case 'p':
 	    yazProxy=strdup(arg);
 	    break;
+        case 'u':
+            if (!auth_command)
+            {
+                auth_command = xmalloc (strlen(arg)+6);
+                strcpy (auth_command, "auth ");
+                strcat (auth_command, arg);
+            }
+            break;
         case 'v':
             yaz_log_init (yaz_log_mask_str(arg), "", NULL);
             break;
         default:
             fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
-                     "[-c cclfields] [-p <proxy-addr>] [<server-addr>]\n",
+                     "[-c cclfields]\n      [-p <proxy-addr>] [-u <auth>] "
+                     "[<server-addr>]\n",
                      prog);
             exit (1);
         }
     }
     initialize();
+    if (auth_command)
+    {
+#ifdef HAVE_GETTIMEOFDAY
+        gettimeofday (&tv_start, 0);
+#endif
+        process_cmd_line (auth_command);
+#if HAVE_READLINE_HISTORY_H
+        add_history(auth_command);
+#endif
+        xfree(auth_command);
+    }
     if (open_command)
     {
 #ifdef HAVE_GETTIMEOFDAY
diff --git a/configure.in b/configure.in
index be3377d..cf57989 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.56 2001-11-19 20:43:39 adam Exp $
+dnl $Id: configure.in,v 1.57 2002-01-11 20:17:03 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8.4)
+AM_INIT_AUTOMAKE(yaz, 1.8.5)
 dnl
 AC_SUBST(READLINE_LIBS)
 dnl ------ Checking programs
diff --git a/debian/rules b/debian/rules
index 0e96b0a..c138695 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ YAZSRCDIR=$(shell pwd)
 YAZ_VERSION=$(shell date -r$(YAZSRCDIR)/CVS +"CVS%Y%m%d")
 else
 YAZSRCDIR=$(shell pwd)
-YAZ_VERSION=1.8.4
+YAZ_VERSION=1.8.5
 endif
 
 configure: stamp-configure
diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index aefa1d4..6d336f2 100644
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -1,11 +1,11 @@
 /*
  * Current software version.
  *
- * $Id: yaz-version.h,v 1.11 2001-11-19 20:43:39 adam Exp $
+ * $Id: yaz-version.h,v 1.12 2002-01-11 20:17:03 adam Exp $
  */
 #ifndef YAZ_VERSION
 
-#define YAZ_VERSION "1.8.4"
+#define YAZ_VERSION "1.8.5"
 #include <yaz/yaz-date.h>
 
 #ifdef WIN32
diff --git a/win/yaz.rc b/win/yaz.rc
index 572ad51..409803c 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -73,14 +73,14 @@ BEGIN
             VALUE "Comments", "Z39.50 C Library\0"
             VALUE "CompanyName", "Index Data\0"
             VALUE "FileDescription", "YAZ Toolkit\0"
-            VALUE "FileVersion", "1, 8, 4, 0\0"
+            VALUE "FileVersion", "1, 8, 5, 0\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2002 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"
-            VALUE "ProductVersion", "1, 8, 4, 0\0"
+            VALUE "ProductVersion", "1, 8, 5, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/yaz.spec b/yaz.spec
index a6ebcf7..dd43362 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,5 +1,5 @@
 Name: yaz
-Version: 1.8.4
+Version: 1.8.5
 Release: 1
 Copyright: YAZ License
 Group: Development/Libraries
-- 
1.7.10.4