thread safe. The function options ignores empty arguments when met.
-# Copyright (C) 1994-1996, Index Data I/S
+# Copyright (C) 1994-1997, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.21 1996-08-12 14:10:34 adam Exp $
+# $Id: Makefile,v 1.22 1997-09-01 08:54:12 adam Exp $
SHELL=/bin/sh
INCLUDE=-I../include -I.
SHELL=/bin/sh
INCLUDE=-I../include -I.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: log.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: log.c,v $
- * Revision 1.12 1997-05-01 15:08:14 adam
+ * Revision 1.13 1997-09-01 08:54:13 adam
+ * New windows NT/95 port using MSV5.0. Made prefix query handling
+ * thread safe. The function options ignores empty arguments when met.
+ *
+ * Revision 1.12 1997/05/01 15:08:14 adam
* Added log_mask_str_x routine.
*
* Revision 1.11 1996/02/05 12:24:32 adam
* Added log_mask_str_x routine.
*
* Revision 1.11 1996/02/05 12:24:32 adam
#include <log.h>
static int l_level = LOG_DEFAULT_LEVEL;
#include <log.h>
static int l_level = LOG_DEFAULT_LEVEL;
-static FILE *l_file = stderr;
+static FILE *l_file = NULL;
static char l_prefix[512] = "log";
static struct {
static char l_prefix[512] = "log";
static struct {
+#ifndef strerror
+#ifndef WINDOWS
char *strerror(int n)
{
extern char *sys_errlist[];
char *strerror(int n)
{
extern char *sys_errlist[];
if (!(level & l_level))
return;
if (!(level & l_level))
return;
+ if (!l_file)
+ l_file = stderr;
*flags = '\0';
for (i = 0; level && mask_names[i].name; i++)
if (mask_names[i].mask & level)
*flags = '\0';
for (i = 0; level && mask_names[i].name; i++)
if (mask_names[i].mask & level)
level = atoi (str);
else
for (i = 0; mask_names[i].name; i++)
level = atoi (str);
else
for (i = 0; mask_names[i].name; i++)
- if (strlen (mask_names[i].name) == p-str &&
+ if (strlen (mask_names[i].name) == (size_t) (p-str) &&
memcmp (mask_names[i].name, str, p-str) == 0)
{
if (mask_names[i].mask)
memcmp (mask_names[i].name, str, p-str) == 0)
{
if (mask_names[i].mask)
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: options.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: options.c,v $
- * Revision 1.5 1995-12-06 13:00:19 adam
+ * Revision 1.6 1997-09-01 08:54:13 adam
+ * New windows NT/95 port using MSV5.0. Made prefix query handling
+ * thread safe. The function options ignores empty arguments when met.
+ *
+ * Revision 1.5 1995/12/06 13:00:19 adam
* Minus alone not treated as an option.
*
* Revision 1.4 1995/09/29 17:12:35 quinn
* Minus alone not treated as an option.
*
* Revision 1.4 1995/09/29 17:12:35 quinn
return -2;
if (arg_off == 0)
{
return -2;
if (arg_off == 0)
{
+ while (argv[arg_no][0] == '\0')
+ {
+ arg_no++;
+ if (arg_no >= argc)
+ return -2;
+ }
if (argv[arg_no][0] != '-' || argv[arg_no][1] == '\0')
{
*arg = argv[arg_no++];
if (argv[arg_no][0] != '-' || argv[arg_no][1] == '\0')
{
*arg = argv[arg_no++];
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
- * Revision 1.11 1996-11-11 13:15:29 adam
+ * Revision 1.12 1997-09-01 08:54:13 adam
+ * New windows NT/95 port using MSV5.0. Made prefix query handling
+ * thread safe. The function options ignores empty arguments when met.
+ *
+ * Revision 1.11 1996/11/11 13:15:29 adam
* Added proximity operator.
*
* Revision 1.10 1996/08/12 14:10:35 adam
* Added proximity operator.
*
* Revision 1.10 1996/08/12 14:10:35 adam
static oid_value p_query_dfset = VAL_NONE;
static oid_value p_query_dfset = VAL_NONE;
-static const char *query_buf;
-static const char *query_lex_buf;
-static int query_lex_len;
-static int query_look = 0;
-static char *left_sep = "{\"";
-static char *right_sep = "}\"";
-static int escape_char = '@';
-
-static Z_RPNStructure *rpn_structure (ODR o, oid_proto,
+struct lex_info {
+ const char *query_buf;
+ const char *lex_buf;
+ int lex_len;
+ int query_look;
+ char *left_sep;
+ char *right_sep;
+ int escape_char;
+};
+
+static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o, oid_proto,
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set);
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set);
-static int query_oid_getvalbyname (void)
+static int query_oid_getvalbyname (struct lex_info *li)
- if (query_lex_len > 31)
- memcpy (buf, query_lex_buf, query_lex_len);
- buf[query_lex_len] = '\0';
+ memcpy (buf, li->lex_buf, li->lex_len);
+ buf[li->lex_len] = '\0';
return oid_getvalbyname (buf);
}
return oid_getvalbyname (buf);
}
-static int query_token (const char **qptr, const char **lex_buf, int *lex_len)
+static int query_token (struct lex_info *li)
+ const char **qptr = &li->query_buf;
while (**qptr == ' ')
(*qptr)++;
if (**qptr == '\0')
return 0;
while (**qptr == ' ')
(*qptr)++;
if (**qptr == '\0')
return 0;
- *lex_len = 0;
- if ((sep_match = strchr (left_sep, **qptr)))
+ li->lex_len = 0;
+ if ((sep_match = strchr (li->left_sep, **qptr)))
- int sep_index = sep_match - left_sep;
+ int sep_index = sep_match - li->left_sep;
- *lex_buf = *qptr;
- while (**qptr && **qptr != right_sep[sep_index])
+ li->lex_buf = *qptr;
+ while (**qptr && **qptr != li->right_sep[sep_index])
while (**qptr && **qptr != ' ')
{
while (**qptr && **qptr != ' ')
{
- if (*lex_len >= 1 && (*lex_buf)[0] == escape_char)
+ if (li->lex_len >= 1 && li->lex_buf[0] == li->escape_char)
- if (*lex_len == 4 && !memcmp (*lex_buf+1, "and", 3))
+ if (li->lex_len == 4 && !memcmp (li->lex_buf+1, "and", 3))
- if (*lex_len == 3 && !memcmp (*lex_buf+1, "or", 2))
+ if (li->lex_len == 3 && !memcmp (li->lex_buf+1, "or", 2))
- if (*lex_len == 4 && !memcmp (*lex_buf+1, "not", 3))
+ if (li->lex_len == 4 && !memcmp (li->lex_buf+1, "not", 3))
- if (*lex_len == 5 && !memcmp (*lex_buf+1, "attr", 4))
+ if (li->lex_len == 5 && !memcmp (li->lex_buf+1, "attr", 4))
- if (*lex_len == 4 && !memcmp (*lex_buf+1, "set", 3))
+ if (li->lex_len == 4 && !memcmp (li->lex_buf+1, "set", 3))
- if (*lex_len == 8 && !memcmp (*lex_buf+1, "attrset", 7))
+ if (li->lex_len == 8 && !memcmp (li->lex_buf+1, "attrset", 7))
- if (*lex_len == 5 && !memcmp (*lex_buf+1, "prox", 4))
+ if (li->lex_len == 5 && !memcmp (li->lex_buf+1, "prox", 4))
return 'p';
}
return 't';
}
return 'p';
}
return 't';
}
+static int lex (struct lex_info *li)
- return query_look =
- query_token (&query_buf, &query_lex_buf, &query_lex_len);
+ return li->query_look = query_token (li);
-static Z_AttributesPlusTerm *rpn_term (ODR o, oid_proto proto,
+static Z_AttributesPlusTerm *rpn_term (struct lex_info *li, ODR o,
+ oid_proto proto,
int num_attr, int *attr_list,
oid_value *attr_set)
{
int num_attr, int *attr_list,
oid_value *attr_set)
{
zapt->term = term;
term->which = Z_Term_general;
term->u.general = term_octet;
zapt->term = term;
term->which = Z_Term_general;
term->u.general = term_octet;
- term_octet->buf = odr_malloc (o, query_lex_len);
- term_octet->size = term_octet->len = query_lex_len;
- memcpy (term_octet->buf, query_lex_buf, query_lex_len);
+ term_octet->buf = odr_malloc (o, li->lex_len);
+ term_octet->size = term_octet->len = li->lex_len;
+ memcpy (term_octet->buf, li->lex_buf, li->lex_len);
-static Z_Operand *rpn_simple (ODR o, oid_proto proto,
+static Z_Operand *rpn_simple (struct lex_info *li, ODR o, oid_proto proto,
int num_attr, int *attr_list,
oid_value *attr_set)
{
Z_Operand *zo;
zo = odr_malloc (o, sizeof(*zo));
int num_attr, int *attr_list,
oid_value *attr_set)
{
Z_Operand *zo;
zo = odr_malloc (o, sizeof(*zo));
+ switch (li->query_look)
{
case 't':
zo->which = Z_Operand_APT;
if (!(zo->u.attributesPlusTerm =
{
case 't':
zo->which = Z_Operand_APT;
if (!(zo->u.attributesPlusTerm =
- rpn_term (o, proto, num_attr, attr_list, attr_set)))
+ rpn_term (li, o, proto, num_attr, attr_list, attr_set)))
- lex ();
- if (!query_look)
+ lex (li);
+ if (!li->query_look)
return NULL;
zo->which = Z_Operand_resultSetId;
return NULL;
zo->which = Z_Operand_resultSetId;
- zo->u.resultSetId = odr_malloc (o, query_lex_len+1);
- memcpy (zo->u.resultSetId, query_lex_buf, query_lex_len);
- zo->u.resultSetId[query_lex_len] = '\0';
- lex ();
+ zo->u.resultSetId = odr_malloc (o, li->lex_len+1);
+ memcpy (zo->u.resultSetId, li->lex_buf, li->lex_len);
+ zo->u.resultSetId[li->lex_len] = '\0';
+ lex (li);
break;
default:
return NULL;
break;
default:
return NULL;
-static Z_ProximityOperator *rpn_proximity (ODR o)
+static Z_ProximityOperator *rpn_proximity (struct lex_info *li, ODR o)
{
Z_ProximityOperator *p = odr_malloc (o, sizeof(*p));
{
Z_ProximityOperator *p = odr_malloc (o, sizeof(*p));
- if (*query_lex_buf == '1')
+ if (*li->lex_buf == '1')
{
p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 1;
}
{
p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 1;
}
- else if (*query_lex_buf == '0')
+ else if (*li->lex_buf == '0')
{
p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 0;
{
p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 0;
else
p->exclusion = NULL;
else
p->exclusion = NULL;
return NULL;
p->distance = odr_malloc (o, sizeof(*p->distance));
return NULL;
p->distance = odr_malloc (o, sizeof(*p->distance));
- *p->distance = atoi (query_lex_buf);
+ *p->distance = atoi (li->lex_buf);
return NULL;
p->ordered = odr_malloc (o, sizeof(*p->ordered));
return NULL;
p->ordered = odr_malloc (o, sizeof(*p->ordered));
- *p->ordered = atoi (query_lex_buf);
+ *p->ordered = atoi (li->lex_buf);
return NULL;
p->relationType = odr_malloc (o, sizeof(*p->relationType));
return NULL;
p->relationType = odr_malloc (o, sizeof(*p->relationType));
- *p->relationType = atoi (query_lex_buf);
+ *p->relationType = atoi (li->lex_buf);
- if (*query_lex_buf == 'k')
+ if (*li->lex_buf == 'k')
- else if (*query_lex_buf == 'p')
+ else if (*li->lex_buf == 'p')
- p->which = atoi (query_lex_buf);
+ p->which = atoi (li->lex_buf);
return NULL;
p->proximityUnitCode = odr_malloc (o, sizeof(*p->proximityUnitCode));
return NULL;
p->proximityUnitCode = odr_malloc (o, sizeof(*p->proximityUnitCode));
- *p->proximityUnitCode = atoi (query_lex_buf);
+ *p->proximityUnitCode = atoi (li->lex_buf);
-static Z_Complex *rpn_complex (ODR o, oid_proto proto,
+static Z_Complex *rpn_complex (struct lex_info *li, ODR o, oid_proto proto,
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set)
{
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set)
{
zc = odr_malloc (o, sizeof(*zc));
zo = odr_malloc (o, sizeof(*zo));
zc->roperator = zo;
zc = odr_malloc (o, sizeof(*zc));
zo = odr_malloc (o, sizeof(*zo));
zc->roperator = zo;
+ switch (li->query_look)
{
case 'a':
zo->which = Z_Operator_and;
{
case 'a':
zo->which = Z_Operator_and;
break;
case 'p':
zo->which = Z_Operator_prox;
break;
case 'p':
zo->which = Z_Operator_prox;
- zo->u.prox = rpn_proximity (o);
+ zo->u.prox = rpn_proximity (li, o);
if (!zo->u.prox)
return NULL;
break;
default:
return NULL;
}
if (!zo->u.prox)
return NULL;
break;
default:
return NULL;
}
- rpn_structure (o, proto, num_attr, max_attr, attr_list, attr_set)))
+ rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
+ attr_set)))
return NULL;
if (!(zc->s2 =
return NULL;
if (!(zc->s2 =
- rpn_structure (o, proto, num_attr, max_attr, attr_list, attr_set)))
+ rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
+ attr_set)))
return NULL;
return zc;
}
return NULL;
return zc;
}
-static Z_RPNStructure *rpn_structure (ODR o, oid_proto proto,
+static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o,
+ oid_proto proto,
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set)
{
int num_attr, int max_attr,
int *attr_list, oid_value *attr_set)
{
const char *cp;
sz = odr_malloc (o, sizeof(*sz));
const char *cp;
sz = odr_malloc (o, sizeof(*sz));
+ switch (li->query_look)
case 'p':
sz->which = Z_RPNStructure_complex;
if (!(sz->u.complex =
case 'p':
sz->which = Z_RPNStructure_complex;
if (!(sz->u.complex =
- rpn_complex (o, proto, num_attr, max_attr, attr_list, attr_set)))
+ rpn_complex (li, o, proto, num_attr, max_attr, attr_list,
+ attr_set)))
return NULL;
break;
case 't':
case 's':
sz->which = Z_RPNStructure_simple;
if (!(sz->u.simple =
return NULL;
break;
case 't':
case 's':
sz->which = Z_RPNStructure_simple;
if (!(sz->u.simple =
- rpn_simple (o, proto, num_attr, attr_list, attr_set)))
+ rpn_simple (li, o, proto, num_attr, attr_list,
+ attr_set)))
return NULL;
break;
case 'l':
return NULL;
break;
case 'l':
- lex ();
- if (!query_look)
+ lex (li);
+ if (!li->query_look)
return NULL;
if (num_attr >= max_attr)
return NULL;
return NULL;
if (num_attr >= max_attr)
return NULL;
- if (!(cp = strchr (query_lex_buf, '=')) ||
- (cp-query_lex_buf) > query_lex_len)
+ if (!(cp = strchr (li->lex_buf, '=')) ||
+ (cp-li->lex_buf) > li->lex_len)
- attr_set[num_attr] = query_oid_getvalbyname ();
- lex ();
+ attr_set[num_attr] = query_oid_getvalbyname (li);
+ lex (li);
- if (!(cp = strchr (query_lex_buf, '=')))
+ if (!(cp = strchr (li->lex_buf, '=')))
else
attr_set[num_attr] = VAL_NONE;
}
else
attr_set[num_attr] = VAL_NONE;
}
- attr_list[2*num_attr] = atoi (query_lex_buf);
+ attr_list[2*num_attr] = atoi (li->lex_buf);
attr_list[2*num_attr+1] = atoi (cp+1);
num_attr++;
attr_list[2*num_attr+1] = atoi (cp+1);
num_attr++;
- rpn_structure (o, proto, num_attr, max_attr, attr_list, attr_set);
+ rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
+ attr_set);
case 0: /* operator/operand expected! */
return NULL;
}
return sz;
}
case 0: /* operator/operand expected! */
return NULL;
}
return sz;
}
-Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf)
+Z_RPNQuery *p_query_rpn_mk (ODR o, struct lex_info *li, oid_proto proto,
+ const char *qbuf)
{
Z_RPNQuery *zq;
int attr_array[1024];
{
Z_RPNQuery *zq;
int attr_array[1024];
oid_value topSet = VAL_NONE;
oident oset;
oid_value topSet = VAL_NONE;
oident oset;
zq = odr_malloc (o, sizeof(*zq));
zq = odr_malloc (o, sizeof(*zq));
- lex ();
- if (query_look == 'r')
+ lex (li);
+ if (li->query_look == 'r')
- lex ();
- topSet = query_oid_getvalbyname ();
+ lex (li);
+ topSet = query_oid_getvalbyname (li);
if (topSet == VAL_NONE)
return NULL;
if (topSet == VAL_NONE)
return NULL;
}
if (topSet == VAL_NONE)
topSet = p_query_dfset;
}
if (topSet == VAL_NONE)
topSet = p_query_dfset;
zq->attributeSetId = odr_oiddup (o, oid_getoidbyent (&oset));
zq->attributeSetId = odr_oiddup (o, oid_getoidbyent (&oset));
- if (!(zq->RPNStructure = rpn_structure (o, proto, 0, 512,
+ if (!(zq->RPNStructure = rpn_structure (li, o, proto, 0, 512,
attr_array, attr_set)))
return NULL;
return zq;
}
attr_array, attr_set)))
return NULL;
return zq;
}
-Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
- Odr_oid **attributeSetP,
- const char *qbuf)
+Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto,
+ const char *qbuf)
+{
+ struct lex_info li;
+
+ li.left_sep = "{\"";
+ li.right_sep = "}\"";
+ li.escape_char = '@';
+ li.query_buf = qbuf;
+ return p_query_rpn_mk (o, &li, proto, qbuf);
+}
+
+Z_AttributesPlusTerm *p_query_scan_mk (struct lex_info *li,
+ ODR o, oid_proto proto,
+ Odr_oid **attributeSetP,
+ const char *qbuf)
{
int attr_list[1024];
oid_value attr_set[512];
{
int attr_list[1024];
oid_value attr_set[512];
oid_value topSet = VAL_NONE;
oident oset;
oid_value topSet = VAL_NONE;
oident oset;
- query_buf = qbuf;
-
- lex ();
- if (query_look == 'r')
+ lex (li);
+ if (li->query_look == 'r')
- lex ();
- topSet = query_oid_getvalbyname ();
+ lex (li);
+ topSet = query_oid_getvalbyname (li);
}
if (topSet == VAL_NONE)
topSet = p_query_dfset;
}
if (topSet == VAL_NONE)
topSet = p_query_dfset;
*attributeSetP = odr_oiddup (o, oid_getoidbyent (&oset));
*attributeSetP = odr_oiddup (o, oid_getoidbyent (&oset));
- while (query_look == 'l')
+ while (li->query_look == 'l')
- lex ();
- if (!query_look)
+ lex (li);
+ if (!li->query_look)
return NULL;
if (num_attr >= max_attr)
return NULL;
return NULL;
if (num_attr >= max_attr)
return NULL;
- if (!(cp = strchr (query_lex_buf, '=')) ||
- (cp-query_lex_buf) > query_lex_len)
+ if (!(cp = strchr (li->lex_buf, '=')) ||
+ (cp-li->lex_buf) > li->lex_len)
- attr_set[num_attr] = query_oid_getvalbyname ();
- lex ();
+ attr_set[num_attr] = query_oid_getvalbyname (li);
+ lex (li);
- if (!(cp = strchr (query_lex_buf, '=')))
+ if (!(cp = strchr (li->lex_buf, '=')))
else
attr_set[num_attr] = VAL_NONE;
}
else
attr_set[num_attr] = VAL_NONE;
}
- attr_list[2*num_attr] = atoi (query_lex_buf);
+ attr_list[2*num_attr] = atoi (li->lex_buf);
attr_list[2*num_attr+1] = atoi (cp+1);
num_attr++;
attr_list[2*num_attr+1] = atoi (cp+1);
num_attr++;
- return rpn_term (o, proto, num_attr, attr_list, attr_set);
+ return rpn_term (li, o, proto, num_attr, attr_list, attr_set);
+}
+
+Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
+ Odr_oid **attributeSetP,
+ const char *qbuf)
+{
+ struct lex_info li;
+
+ li.left_sep = "{\"";
+ li.right_sep = "}\"";
+ li.escape_char = '@';
+ li.query_buf = qbuf;
+
+ return p_query_scan_mk (&li, o, proto, attributeSetP, qbuf);
}
int p_query_attset (const char *arg)
}
int p_query_attset (const char *arg)