* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.31 2005-06-25 15:46:05 adam Exp $
+ * $Id: statserv.c,v 1.33 2005-10-20 19:28:04 quinn Exp $
*/
/**
unsigned char *cp;
xmlNodePtr p;
int len = 1; /* start with 1, because of trailing 0 */
- char *str;
+ unsigned char *str;
int first = 1; /* whitespace lead flag .. */
/* determine length */
for (p = ptr; p; p = p->next)
{
if (p->type == XML_TEXT_NODE)
- len += strlen(p->content);
+ len += xmlStrlen(p->content);
}
/* now allocate for the string */
str = nmem_malloc(n, len);
if (*cp)
first = 0; /* reset if we got non-whitespace out */
}
- strcat(str, cp); /* append */
+ strcat((char *)str, (const char *)cp); /* append */
}
}
/* remove trailing whitespace */
- cp = strlen(str) + str;
- while ((char*) cp != str && isspace(cp[-1]))
+ cp = strlen((const char *)str) + str;
+ while (cp != str && isspace(cp[-1]))
cp--;
*cp = '\0';
/* return resulting string */
- return str;
+ return (char *) str;
}
#endif
const char *address =
nmem_dup_xml_content(gfs_nmem, ptr->children);
for ( ; attr; attr = attr->next)
- if (!strcmp(attr->name, "id")
+ if (!xmlStrcmp(attr->name, BAD_CAST "id")
&& attr->children && attr->children->type == XML_TEXT_NODE)
id = nmem_dup_xml_content(gfs_nmem, attr->children);
if (address)
const char *id = 0;
for ( ; attr; attr = attr->next)
- if (!strcmp(attr->name, "listenref") && attr->children &&
- attr->children->type == XML_TEXT_NODE)
+ if (!xmlStrcmp(attr->name, BAD_CAST "listenref")
+ && attr->children && attr->children->type == XML_TEXT_NODE)
listenref = nmem_dup_xml_content(gfs_nmem, attr->children);
- else if (!strcmp(attr->name, "id") && attr->children &&
- attr->children->type == XML_TEXT_NODE)
+ else if (!xmlStrcmp(attr->name, BAD_CAST "id")
+ && attr->children
+ && attr->children->type == XML_TEXT_NODE)
id = nmem_dup_xml_content(gfs_nmem, attr->children);
else
yaz_log(YLOG_WARN, "Unknown attribute '%s' for server",
yaz_log_init_level(control_block.loglevel);
get_logbits(1);
- while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:",
+ while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:",
argv, argc, &arg)) != -2)
{
switch (ret)
option_copy(control_block.logfile, arg);
yaz_log_init(control_block.loglevel, me, control_block.logfile);
break;
+ case 'm':
+ if (!arg) {
+ fprintf(stderr, "%s: Specify time format for log file.\n", me);
+ return(1);
+ }
+ yaz_log_time_format(arg);
+ break;
case 'v':
control_block.loglevel =
yaz_log_mask_str_x(arg,control_block.loglevel);
fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
" -k <kilobytes> -d <daemon> -p <pidfile> -C certfile"
- " -ziDST1 -w <directory> <listener-addr>... ]\n", me);
+ " -ziDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
return 1;
}
}