Add new function nmem_strsplitx.

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

diff --git a/src/statserv.c b/src/statserv.c
index ab15c21..a039251 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #ifdef WIN32
 #include <process.h>
@@ -64,6 +63,7 @@
 #include "session.h"
 #include <yaz/statserv.h>
 #include <yaz/daemon.h>
+#include <yaz/yaz-iconv.h>
 
 static IOCHAN pListener = NULL;
 
@@ -195,7 +195,7 @@ static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
             cp = p->content;
             if (first)
             {
-                while(*cp && isspace(*cp))
+                while(*cp && yaz_isspace(*cp))
                     cp++;
                 if (*cp)
                     first = 0;  /* reset if we got non-whitespace out */
@@ -205,7 +205,7 @@ static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
     }
     /* remove trailing whitespace */
     cp = strlen((const char *)str) + str;
-    while (cp != str && isspace(cp[-1]))
+    while (cp != str && yaz_isspace(cp[-1]))
         cp--;
     *cp = '\0';
     /* return resulting string */
@@ -418,9 +418,14 @@ static void xml_config_read(void)
                 }
                 else if (!strcmp((const char *) ptr->name, "cql2rpn"))
                 {
-                    gfs->cql_transform = cql_transform_open_fname(
-                        nmem_dup_xml_content(gfs_nmem, ptr->children)
-                        );
+                    char *name = nmem_dup_xml_content(gfs_nmem, ptr->children);
+                    gfs->cql_transform = cql_transform_open_fname(name);
+                    if (!gfs->cql_transform)
+                    {
+                        yaz_log(YLOG_FATAL|YLOG_ERRNO,
+                                "open CQL transform file '%s'", name);
+                        exit(1);
+                    }
                 }
                 else if (!strcmp((const char *) ptr->name, "ccl2rpn"))
                 {
@@ -610,6 +615,8 @@ static void xml_config_bend_stop(void)
     }
 }
 
+static void remove_listeners(void);
+
 /*
  * handle incoming connect requests.
  * The dynamic mode is a bit tricky mostly because we want to avoid
@@ -909,6 +916,9 @@ static void listener(IOCHAN h, int event)
             return;
         }
 
+        if (control_block.one_shot)
+            remove_listeners();
+
         yaz_log(log_sessiondetail, "Connect from %s", cs_addrstr(new_line));
 
         no_sessions++;
@@ -1129,6 +1139,13 @@ static int add_listener(char *where, int listen_id)
     return 0; /* OK */
 }
 
+static void remove_listeners(void)
+{
+    IOCHAN l = pListener;
+    for (; l; l = l->next)
+        iochan_destroy(l);
+}
+
 #ifndef WIN32
 /* UNIX only (for windows we don't need to catch the signals) */
 static void catchchld(int num)