projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed CQL term parsing: first char in unquoted terms was not prepared
[yaz-moved-to-github.git]
/
src
/
statserv.c
diff --git
a/src/statserv.c
b/src/statserv.c
index
bed22d0
..
42acb60
100644
(file)
--- a/
src/statserv.c
+++ b/
src/statserv.c
@@
-5,7
+5,7
@@
* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.41 2006-09-06 09:35:42 adam Exp $
+ * $Id: statserv.c,v 1.44 2006-09-29 13:20:23 adam Exp $
*/
/**
*/
/**
@@
-151,7
+151,7
@@
static xmlDocPtr xml_config_doc = 0;
#endif
#if YAZ_HAVE_XML2
#endif
#if YAZ_HAVE_XML2
-static xmlNodePtr xml_config_get_root()
+static xmlNodePtr xml_config_get_root(void)
{
xmlNodePtr ptr = 0;
if (xml_config_doc)
{
xmlNodePtr ptr = 0;
if (xml_config_doc)
@@
-212,7
+212,7
@@
static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
}
#endif
}
#endif
-static struct gfs_server * gfs_server_new()
+static struct gfs_server * gfs_server_new(void)
{
struct gfs_server *n = nmem_malloc(gfs_nmem, sizeof(*n));
memcpy(&n->cb, &control_block, sizeof(control_block));
{
struct gfs_server *n = nmem_malloc(gfs_nmem, sizeof(*n));
memcpy(&n->cb, &control_block, sizeof(control_block));
@@
-327,7
+327,7
@@
int control_association(association *assoc, const char *host, int force_open)
return 1;
}
return 1;
}
-static void xml_config_read()
+static void xml_config_read(void)
{
struct gfs_server **gfsp = &gfs_server_list;
struct gfs_listen **gfslp = &gfs_listen_list;
{
struct gfs_server **gfsp = &gfs_server_list;
struct gfs_listen **gfslp = &gfs_listen_list;
@@
-466,7
+466,7
@@
static void xml_config_read()
*gfsp = 0;
}
*gfsp = 0;
}
-static void xml_config_open()
+static void xml_config_open(void)
{
if (!getcwd(gfs_root_dir, FILENAME_MAX))
{
{
if (!getcwd(gfs_root_dir, FILENAME_MAX))
{
@@
-509,7
+509,7
@@
static void xml_config_open()
#endif
}
#endif
}
-static void xml_config_close()
+static void xml_config_close(void)
{
#if YAZ_HAVE_XML2
if (xml_config_doc)
{
#if YAZ_HAVE_XML2
if (xml_config_doc)
@@
-529,7
+529,7
@@
static void xml_config_close()
#endif
}
#endif
}
-static void xml_config_add_listeners()
+static void xml_config_add_listeners(void)
{
struct gfs_listen *gfs = gfs_listen_list;
int id_no;
{
struct gfs_listen *gfs = gfs_listen_list;
int id_no;
@@
-541,7
+541,7
@@
static void xml_config_add_listeners()
}
}
}
}
-static void xml_config_bend_start()
+static void xml_config_bend_start(void)
{
if (control_block.xml_config[0])
{
{
if (control_block.xml_config[0])
{
@@
-567,7
+567,7
@@
static void xml_config_bend_start()
}
}
}
}
-static void xml_config_bend_stop()
+static void xml_config_bend_stop(void)
{
if (control_block.xml_config[0])
{
{
if (control_block.xml_config[0])
{
@@
-770,27
+770,21
@@
static void listener(IOCHAN h, int event)
if (event == EVENT_INPUT)
{
if (event == EVENT_INPUT)
{
+ COMSTACK new_line;
+ IOCHAN new_chan;
+
if ((res = cs_listen(line, 0, 0)) < 0)
{
if ((res = cs_listen(line, 0, 0)) < 0)
{
- yaz_log(YLOG_FATAL, "cs_listen failed");
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "cs_listen failed");
return;
}
else if (res == 1)
return;
}
else if (res == 1)
- return;
+ return; /* incomplete */
yaz_log(YLOG_DEBUG, "listen ok");
yaz_log(YLOG_DEBUG, "listen ok");
- iochan_setevent(h, EVENT_OUTPUT);
- iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */
- }
- else if (event == EVENT_OUTPUT)
- {
- COMSTACK new_line = cs_accept(line);
- IOCHAN new_chan;
- char *a = NULL;
-
- if (!new_line)
+ new_line = cs_accept(line);
+ if (!new_line)
{
yaz_log(YLOG_FATAL, "Accept failed.");
{
yaz_log(YLOG_FATAL, "Accept failed.");
- iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT);
return;
}
yaz_log(YLOG_DEBUG, "Accept ok");
return;
}
yaz_log(YLOG_DEBUG, "Accept ok");
@@
-1355,7
+1349,7
@@
int check_options(int argc, char **argv)
}
get_logbits(1);
}
get_logbits(1);
- while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:",
+ while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:r:",
argv, argc, &arg)) != -2)
{
switch (ret)
argv, argc, &arg)) != -2)
{
switch (ret)
@@
-1465,6
+1459,14
@@
int check_options(int argc, char **argv)
case 'D':
control_block.background = 1;
break;
case 'D':
control_block.background = 1;
break;
+ case 'r':
+ if (!arg || !(r = atoi(arg)))
+ {
+ fprintf(stderr, "%s: Specify positive size for -r.\n", me);
+ return(1);
+ }
+ yaz_log_init_max_size(r * 1024);
+ break;
default:
fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
default:
fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"