X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fstatserv.c;h=59509ce99c9dd30b64786afa5ebd131d65a89913;hp=9c252e7904ed6cb4a9e84d37884a7174a3fce502;hb=7887bf02371157d3db6e769506e57c13b7b076cf;hpb=dfe360ef9c3b9ae84a2812bed499c1ac1b84b16d

diff --git a/src/statserv.c b/src/statserv.c
index 9c252e7..59509ce 100644
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -208,6 +208,7 @@ static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
 }
 #endif
 
+#if YAZ_HAVE_XML2
 static struct gfs_server * gfs_server_new(void)
 {
     struct gfs_server *n = (struct gfs_server *)
@@ -222,12 +223,12 @@ static struct gfs_server * gfs_server_new(void)
     n->directory = 0;
     n->docpath = 0;
     n->stylesheet = 0;
-#if YAZ_HAVE_XML2
     n->retrieval = yaz_retrieval_create();
-#endif
     return n;
 }
+#endif
 
+#if YAZ_HAVE_XML2
 static struct gfs_listen * gfs_listen_new(const char *id, 
                                           const char *address)
 {
@@ -241,6 +242,7 @@ static struct gfs_listen * gfs_listen_new(const char *id,
     n->address = nmem_strdup(gfs_nmem, address);
     return n;
 }
+#endif
 
 static void gfs_server_chdir(struct gfs_server *gfs)
 {
@@ -326,11 +328,11 @@ int control_association(association *assoc, const char *host, int force_open)
     return 1;
 }
 
+#if YAZ_HAVE_XML2
 static void xml_config_read(void)
 {
     struct gfs_server **gfsp = &gfs_server_list;
     struct gfs_listen **gfslp = &gfs_listen_list;
-#if YAZ_HAVE_XML2
     xmlNodePtr ptr = xml_config_get_root();
 
     if (!ptr)
@@ -475,9 +477,9 @@ static void xml_config_read(void)
             gfsp = &(*gfsp)->next;
         }
     }
-#endif
     *gfsp = 0;
 }
+#endif
 
 static void xml_config_open(void)
 {
@@ -998,7 +1000,6 @@ static void *new_session(void *vp)
     COMSTACK new_line = (COMSTACK) vp;
     IOCHAN parent_chan = (IOCHAN) new_line->user;
 
-    yaz_log_xml_errors(0, YLOG_WARN);
     unsigned cs_get_mask, cs_accept_mask, mask =  
         ((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
         ((new_line->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0);
@@ -1036,6 +1037,7 @@ static void *new_session(void *vp)
 #else
     a = 0;
 #endif
+    yaz_log_xml_errors(0, YLOG_WARN);
     yaz_log(log_session, "Session - OK %d %s %ld",
             no_sessions, a ? a : "[Unknown]", (long) getpid());
     if (max_sessions && no_sessions >= max_sessions)
@@ -1182,7 +1184,11 @@ statserv_options_block *statserv_getcontrol(void)
 
 void statserv_setcontrol(statserv_options_block *block)
 {
-    chdir(gfs_root_dir);
+    if (gfs_root_dir[0])
+    {
+        if (chdir(gfs_root_dir))
+            yaz_log(YLOG_WARN|YLOG_ERRNO, "chdir %s", gfs_root_dir);
+    }
 #ifdef WIN32
     if (init_control_tls)
         TlsSetValue(current_control_tls, block);
@@ -1280,7 +1286,10 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
             close(1);
             close(2);
             open("/dev/null", O_RDWR);
-            dup(0); dup(0);
+            if (dup(0) == -1)
+                return 1;
+            if (dup(0) == -1)
+                return 1;
         }
         xml_config_add_listeners();