/* $OpenLDAP$ */
/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
#include "sets.h"
-static char **set_join (char **lset, int op, char **rset);
-static char **set_chase (SET_GATHER gatherer,
- void *cookie, char **set, char *attr, int attrlen, int closure);
+static BerVarray set_join (SetCookie *cp, BerVarray lset, int op, BerVarray rset);
+static BerVarray set_chase (SLAP_SET_GATHER gatherer,
+ SetCookie *cookie, BerVarray set, struct berval *attr, int closure);
static int set_samedn (char *dn1, char *dn2);
long
-set_size (char **set)
+slap_set_size (BerVarray set)
{
- int i;
+ long i;
i = 0;
if (set != NULL) {
- while (set[i])
+ while (set[i].bv_val)
i++;
}
- return(i);
+ return i;
}
void
-set_dispose (char **set)
+slap_set_dispose (SetCookie *cp, BerVarray set)
{
- int i;
-
- if (set != NULL) {
- for (i = 0; set[i]; i++)
- ch_free(set[i]);
- ch_free(set);
- }
+ ber_bvarray_free_x(set, cp->op->o_tmpmemctx);
}
-static char **
-set_join (char **lset, int op, char **rset)
+static BerVarray
+set_join (SetCookie *cp, BerVarray lset, int op, BerVarray rset)
{
- char **set;
+ BerVarray set;
long i, j, last;
set = NULL;
if (op == '|') {
- if (lset == NULL || *lset == NULL) {
+ if (lset == NULL || lset->bv_val == NULL) {
if (rset == NULL) {
if (lset == NULL)
- return(ch_calloc(1, sizeof(char *)));
+ return(cp->op->o_tmpcalloc(1, sizeof(struct berval),
+ cp->op->o_tmpmemctx));
return(lset);
}
- set_dispose(lset);
+ slap_set_dispose(cp, lset);
return(rset);
}
- if (rset == NULL || *rset == NULL) {
- set_dispose(rset);
+ if (rset == NULL || rset->bv_val == NULL) {
+ slap_set_dispose(cp, rset);
return(lset);
}
- i = set_size(lset) + set_size(rset) + 1;
- set = ch_calloc(i, sizeof(char *));
+ i = slap_set_size(lset) + slap_set_size(rset) + 1;
+ set = cp->op->o_tmpcalloc(i, sizeof(struct berval), cp->op->o_tmpmemctx);
if (set != NULL) {
/* set_chase() depends on this routine to
* keep the first elements of the result
* set the same (and in the same order)
* as the left-set.
*/
- for (i = 0; lset[i]; i++)
+ for (i = 0; lset[i].bv_val; i++)
set[i] = lset[i];
- ch_free(lset);
- for (i = 0; rset[i]; i++) {
- for (j = 0; set[j]; j++) {
- if (set_samedn(rset[i], set[j])) {
- ch_free(rset[i]);
- rset[i] = NULL;
+ cp->op->o_tmpfree(lset, cp->op->o_tmpmemctx);
+ for (i = 0; rset[i].bv_val; i++) {
+ for (j = 0; set[j].bv_val; j++) {
+ if (set_samedn(rset[i].bv_val, set[j].bv_val)) {
+ cp->op->o_tmpfree(rset[i].bv_val, cp->op->o_tmpmemctx);
+ rset[i].bv_val = NULL;
break;
}
}
- if (rset[i])
+ if (rset[i].bv_val)
set[j] = rset[i];
}
- ch_free(rset);
+ cp->op->o_tmpfree(rset, cp->op->o_tmpmemctx);
}
return(set);
}
if (op == '&') {
- if (lset == NULL || *lset == NULL || rset == NULL || *rset == NULL) {
- set = ch_calloc(1, sizeof(char *));
+ if (lset == NULL || lset->bv_val == NULL || rset == NULL || rset->bv_val == NULL) {
+ set = cp->op->o_tmpcalloc(1, sizeof(struct berval), cp->op->o_tmpmemctx);
} else {
set = lset;
lset = NULL;
- last = set_size(set) - 1;
- for (i = 0; set[i]; i++) {
- for (j = 0; rset[j]; j++) {
- if (set_samedn(set[i], rset[j]))
+ last = slap_set_size(set) - 1;
+ for (i = 0; set[i].bv_val; i++) {
+ for (j = 0; rset[j].bv_val; j++) {
+ if (set_samedn(set[i].bv_val, rset[j].bv_val))
break;
}
- if (rset[j] == NULL) {
- ch_free(set[i]);
+ if (rset[j].bv_val == NULL) {
+ cp->op->o_tmpfree(set[i].bv_val, cp->op->o_tmpmemctx);
set[i] = set[last];
- set[last] = NULL;
+ set[last].bv_val = NULL;
last--;
i--;
}
}
}
- set_dispose(lset);
- set_dispose(rset);
+ slap_set_dispose(cp, lset);
+ slap_set_dispose(cp, rset);
return(set);
}
-static char **
-set_chase (SET_GATHER gatherer,
- void *cookie, char **set, char *attr, int attrlen, int closure)
+static BerVarray
+set_chase (SLAP_SET_GATHER gatherer,
+ SetCookie *cp, BerVarray set, struct berval *attr, int closure)
{
- char **vals, **nset;
+ BerVarray vals, nset;
char attrstr[32];
+ struct berval bv;
int i;
+ bv.bv_len = attr->bv_len;
+ bv.bv_val = attrstr;
+
if (set == NULL)
- return(ch_calloc(1, sizeof(char *)));
+ return(cp->op->o_tmpcalloc(1, sizeof(struct berval), cp->op->o_tmpmemctx));
- if (*set == NULL)
+ if (set->bv_val == NULL)
return(set);
- if (attrlen > (sizeof(attrstr) - 1)) {
- set_dispose(set);
+ if (attr->bv_len > (sizeof(attrstr) - 1)) {
+ slap_set_dispose(cp, set);
return(NULL);
}
- AC_MEMCPY(attrstr, attr, attrlen);
- attrstr[attrlen] = 0;
+ AC_MEMCPY(attrstr, attr->bv_val, attr->bv_len);
+ attrstr[attr->bv_len] = 0;
- nset = ch_calloc(1, sizeof(char *));
+ nset = cp->op->o_tmpcalloc(1, sizeof(struct berval), cp->op->o_tmpmemctx);
if (nset == NULL) {
- set_dispose(set);
+ slap_set_dispose(cp, set);
return(NULL);
}
- for (i = 0; set[i]; i++) {
- vals = (gatherer)(cookie, set[i], attrstr);
+ for (i = 0; set[i].bv_val; i++) {
+ vals = (gatherer)(cp, &set[i], &bv);
if (vals != NULL)
- nset = set_join(nset, '|', vals);
+ nset = set_join(cp, nset, '|', vals);
}
- set_dispose(set);
+ slap_set_dispose(cp, set);
if (closure) {
- for (i = 0; nset[i]; i++) {
- vals = (gatherer)(cookie, nset[i], attrstr);
+ for (i = 0; nset[i].bv_val; i++) {
+ vals = (gatherer)(cp, &nset[i], &bv);
if (vals != NULL) {
- nset = set_join(nset, '|', vals);
+ nset = set_join(cp, nset, '|', vals);
if (nset == NULL)
break;
}
}
int
-set_filter (SET_GATHER gatherer,
- void *cookie, char *filter, char *user, char *this, char ***results)
+slap_set_filter (SLAP_SET_GATHER gatherer,
+ SetCookie *cp, struct berval *fbv,
+ struct berval *user, struct berval *this, BerVarray *results)
{
#define IS_SET(x) ( (long)(x) >= 256 )
#define IS_OP(x) ( (long)(x) < 256 )
#define SF_ERROR(x) do { rc = -1; goto _error; } while (0)
-#define SF_TOP() ( (char **)( (stp < 0) ? 0 : stack[stp] ) )
-#define SF_POP() ( (char **)( (stp < 0) ? 0 : stack[stp--] ) )
+#define SF_TOP() ( (BerVarray)( (stp < 0) ? 0 : stack[stp] ) )
+#define SF_POP() ( (BerVarray)( (stp < 0) ? 0 : stack[stp--] ) )
#define SF_PUSH(x) do { \
if (stp >= 63) SF_ERROR(overflow); \
- stack[++stp] = (char **)(long)(x); \
+ stack[++stp] = (BerVarray)(long)(x); \
} while (0)
- char c;
- char **set, **lset;
+ BerVarray set, lset;
+ BerVarray stack[64];
int len, op, rc, stp;
- char **stack[64];
+ char c, *filter = fbv->bv_val;
if (results)
*results = NULL;
stp = -1;
- while (c = *filter++) {
+ while ((c = *filter++)) {
set = NULL;
switch (c) {
case ' ':
op = (long)SF_POP();
lset = SF_POP();
SF_POP();
- set = set_join(lset, op, set);
+ set = set_join(cp, lset, op, set);
if (set == NULL)
SF_ERROR(memory);
SF_PUSH(set);
} else if (IS_OP(SF_TOP())) {
op = (long)SF_POP();
lset = SF_POP();
- set = set_join(lset, op, set);
+ set = set_join(cp, lset, op, set);
if (set == NULL)
SF_ERROR(memory);
SF_PUSH(set);
if (c == 0)
SF_ERROR(syntax);
- set = ch_calloc(2, sizeof(char *));
+ set = cp->op->o_tmpcalloc(2, sizeof(struct berval), cp->op->o_tmpmemctx);
if (set == NULL)
SF_ERROR(memory);
- *set = ch_calloc(len + 1, sizeof(char));
- if (*set == NULL)
+ set->bv_val = cp->op->o_tmpcalloc(len + 1, sizeof(char), cp->op->o_tmpmemctx);
+ if (set->bv_val == NULL)
SF_ERROR(memory);
- AC_MEMCPY(*set, &filter[-len - 1], len);
+ AC_MEMCPY(set->bv_val, &filter[-len - 1], len);
+ set->bv_len = len;
SF_PUSH(set);
set = NULL;
break;
{
if ((SF_TOP() == (void *)'/') || IS_SET(SF_TOP()))
SF_ERROR(syntax);
- set = ch_calloc(2, sizeof(char *));
+ set = cp->op->o_tmpcalloc(2, sizeof(struct berval), cp->op->o_tmpmemctx);
if (set == NULL)
SF_ERROR(memory);
- *set = ch_strdup(this);
- if (*set == NULL)
+ ber_dupbv_x( set, this, cp->op->o_tmpmemctx );
+ if (set->bv_val == NULL)
SF_ERROR(memory);
} else if (len == 4
&& memcmp("user", filter, len) == 0)
{
if ((SF_TOP() == (void *)'/') || IS_SET(SF_TOP()))
SF_ERROR(syntax);
- set = ch_calloc(2, sizeof(char *));
+ set = cp->op->o_tmpcalloc(2, sizeof(struct berval), cp->op->o_tmpmemctx);
if (set == NULL)
SF_ERROR(memory);
- *set = ch_strdup(user);
- if (*set == NULL)
+ ber_dupbv_x( set, user, cp->op->o_tmpmemctx );
+ if (set->bv_val == NULL)
SF_ERROR(memory);
} else if (SF_TOP() != (void *)'/') {
SF_ERROR(syntax);
} else {
+ struct berval fb2;
SF_POP();
+ fb2.bv_val = filter;
+ fb2.bv_len = len;
set = set_chase(gatherer,
- cookie, SF_POP(), filter, len, c == '*');
+ cp, SF_POP(), &fb2, c == '*');
if (set == NULL)
SF_ERROR(memory);
if (c == '*')
} else if (IS_OP(SF_TOP())) {
op = (long)SF_POP();
lset = SF_POP();
- set = set_join(lset, op, set);
+ set = set_join(cp, lset, op, set);
if (set == NULL)
SF_ERROR(memory);
} else {
SF_ERROR(syntax);
}
- rc = set_size(set);
+ rc = slap_set_size(set) > 0 ? 1 : 0;
if (results) {
*results = set;
set = NULL;
_error:
if (IS_SET(set))
- set_dispose(set);
- while (set = SF_POP()) {
+ slap_set_dispose(cp, set);
+ while ((set = SF_POP())) {
if (IS_SET(set))
- set_dispose(set);
+ slap_set_dispose(cp, set);
}
return(rc);
}
projects / openldap / blobdiff