Added handle member to statserv_control.

diff --git a/Makefile.am b/Makefile.am
index 229560b..b02c85d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2000-03-10 08:41:30 adam Exp $
+## $Id: Makefile.am,v 1.6 2000-03-15 12:59:49 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
@@ -10,7 +10,7 @@ noinst_SCRIPTS = yaz-config
 SPEC_FILE=$(PACKAGE).spec
 EXTRA_DIST=$(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
 
-yaz-config:
+yaz-config: Makefile
        @echo "#!/bin/sh" >yaz-config
        @echo "# YAZ settings for developers" >>yaz-config
        @echo "YAZBIN=\"`pwd`/bin\"" >>yaz-config

diff --git a/Makefile.in b/Makefile.in
index 2605a4d..d775862 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-yaz-config:
+yaz-config: Makefile
        @echo "#!/bin/sh" >yaz-config
        @echo "# YAZ settings for developers" >>yaz-config
        @echo "YAZBIN=\"`pwd`/bin\"" >>yaz-config

diff --git a/include/yaz/backend.h b/include/yaz/backend.h
index af26289..214f3e6 100644 (file)
--- a/include/yaz/backend.h
+++ b/include/yaz/backend.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: backend.h,v $
- * Revision 1.4  2000-02-28 11:20:06  adam
+ * Revision 1.5  2000-03-15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.4  2000/02/28 11:20:06  adam
  * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
  *
  * Revision 1.3  2000/01/12 14:36:07  adam
@@ -288,7 +291,6 @@ typedef struct bend_esrequest_rr
 
 typedef struct bend_initrequest
 {
-    char *configname;
     Z_IdAuthentication *auth;
     ODR stream;                /* encoding stream */
     ODR print;                 /* printing stream */

diff --git a/include/yaz/statserv.h b/include/yaz/statserv.h
index f900888..d4a1fad 100644 (file)
--- a/include/yaz/statserv.h
+++ b/include/yaz/statserv.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: statserv.h,v $
- * Revision 1.3  2000-03-14 09:06:11  adam
+ * Revision 1.4  2000-03-15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.3  2000/03/14 09:06:11  adam
  * Added POSIX threads support for frontend server.
  *
  * Revision 1.2  2000/02/28 11:20:06  adam
@@ -126,7 +129,8 @@ typedef struct statserv_options_block
     int (*check_ip)(void *cd, const char *addr, int len, int type);
     char daemon_name[128];
     int inetd;                    /* Do we use the inet deamon or not */
-    
+
+    void *handle;                 /* Handle */
 #ifdef WIN32
     /* We only have these members for the windows version */
     /* They seemed a bit large to have them there in general */

diff --git a/server/seshigh.c b/server/seshigh.c
index 3013c83..ee0f7f2 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  *
  * $Log: seshigh.c,v $
- * Revision 1.101  2000-01-12 14:36:07  adam
+ * Revision 1.102  2000-03-15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.101  2000/01/12 14:36:07  adam
  * Added printing stream (ODR) for backend functions.
  *
  * Revision 1.100  1999/12/16 23:36:19  adam
@@ -837,7 +840,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
 
     binitreq.stream = assoc->encode;
     binitreq.print = assoc->print;
-    binitreq.configname = "default-config";
     binitreq.auth = req->idAuthentication;
     binitreq.referenceId = req->referenceId;
     binitreq.implementation_version = 0;

diff --git a/server/statserv.c b/server/statserv.c
index 0ef6878..965d5d3 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -7,7 +7,10 @@
  *   Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: statserv.c,v $
- * Revision 1.60  2000-03-14 09:06:11  adam
+ * Revision 1.61  2000-03-15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.60  2000/03/14 09:06:11  adam
  * Added POSIX threads support for frontend server.
  *
  * Revision 1.59  1999/11/30 13:47:12  adam
@@ -264,7 +267,8 @@ statserv_options_block control_block = {
     check_options,              /* Default routine, for checking the run-time arguments */
     check_ip_tcpd,
     "",
-    0                           /* default value for inet deamon */
+    0,                          /* default value for inet deamon */
+    0,                          /* handle (for service, etc) */
 
 #ifdef WIN32
     ,"Z39.50 Server",           /* NT Service Name */
@@ -927,6 +931,7 @@ int check_options(int argc, char **argv)
            control_block.threads = 1;
 #else
            fprintf(stderr, "%s: Threaded mode not available.\n", me);
+           return 1;
 #endif
            break;
        case 'l':
@@ -972,7 +977,7 @@ int check_options(int argc, char **argv)
            if (chdir(arg))
            {
                perror(arg);            
-               return(1);
+               return 1;
            }
            break;
        default:
@@ -980,7 +985,7 @@ int check_options(int argc, char **argv)
                    " -l <logfile> -u <user> -c <config> -t <minutes>"
                    " -k <kilobytes> -d <daemon>"
                         " -zsiST -w <directory> <listender-addr>... ]\n", me);
-           return(1);
+           return 1;
         }
     }
     return 0;

diff --git a/zutil/diagbib1.c b/zutil/diagbib1.c
index e7fb417..0822307 100644 (file)
--- a/zutil/diagbib1.c
+++ b/zutil/diagbib1.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: diagbib1.c,v $
- * Revision 1.2  1999-11-30 13:47:12  adam
+ * Revision 1.3  2000-03-15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.2  1999/11/30 13:47:12  adam
  * Improved installation. Moved header files to include/yaz.
  *
  * Revision 1.1  1999/06/08 10:10:16  adam