/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* ad.c - routines for dealing with attribute descriptions */
}
}
-/* Is there an AttributeDescription for this type that uses this language? */
-AttributeDescription * ad_find_lang(
+/* Is there an AttributeDescription for this type that uses these tags? */
+AttributeDescription * ad_find_tags(
AttributeType *type,
- struct berval *lang )
+ struct berval *tags )
{
AttributeDescription *ad;
ldap_pvt_thread_mutex_lock( &type->sat_ad_mutex );
for (ad = type->sat_ad; ad; ad=ad->ad_next)
{
- if (ad->ad_lang.bv_len == lang->bv_len &&
- !strcasecmp(ad->ad_lang.bv_val, lang->bv_val))
+ if (ad->ad_tags.bv_len == tags->bv_len &&
+ !strcasecmp(ad->ad_tags.bv_val, tags->bv_val))
break;
}
ldap_pvt_thread_mutex_unlock( &type->sat_ad_mutex );
AttributeDescription desc, *d2;
char *name, *options;
char *opt, *next;
- int nlang;
- int langlen;
+ int ntags;
+ int tagslen;
/* hardcoded limits for speed */
-#define MAX_LANG_OPTIONS 128
- struct berval langs[MAX_LANG_OPTIONS+1];
-#define MAX_LANG_LEN 1024
- char langbuf[MAX_LANG_LEN];
+#define MAX_TAGGING_OPTIONS 128
+ struct berval tags[MAX_TAGGING_OPTIONS+1];
+#define MAX_TAGS_LEN 1024
+ char tagbuf[MAX_TAGS_LEN];
assert( ad != NULL );
assert( *ad == NULL ); /* temporary */
/*
* parse options in place
*/
- nlang = 0;
- memset( langs, 0, sizeof( langs ));
- langlen = 0;
+ ntags = 0;
+ memset( tags, 0, sizeof( tags ));
+ tagslen = 0;
for( opt=options; opt != NULL; opt=next ) {
int optlen;
desc.ad_flags |= SLAP_DESC_BINARY;
continue;
- } else if ( ad_find_option_definition( opt, optlen ) )
- {
+ } else if ( ad_find_option_definition( opt, optlen ) ) {
int i;
if( opt[optlen-1] == '-' ) {
- desc.ad_flags |= SLAP_DESC_LANG_RANGE;
+ desc.ad_flags |= SLAP_DESC_TAG_RANGE;
}
- if( nlang >= MAX_LANG_OPTIONS ) {
+ if( ntags >= MAX_TAGGING_OPTIONS ) {
*text = "too many tagging options";
return rtn;
}
* tags should be presented in sorted order,
* so run the array in reverse.
*/
- for( i=nlang-1; i>=0; i-- ) {
+ for( i=ntags-1; i>=0; i-- ) {
int rc;
- rc = strncasecmp( opt, langs[i].bv_val,
- (unsigned) optlen < langs[i].bv_len
- ? optlen : langs[i].bv_len );
+ rc = strncasecmp( opt, tags[i].bv_val,
+ (unsigned) optlen < tags[i].bv_len
+ ? optlen : tags[i].bv_len );
- if( rc == 0 && (unsigned)optlen == langs[i].bv_len ) {
+ if( rc == 0 && (unsigned)optlen == tags[i].bv_len ) {
/* duplicate (ignore) */
goto done;
} else if ( rc > 0 ||
- ( rc == 0 && (unsigned)optlen > langs[i].bv_len ))
+ ( rc == 0 && (unsigned)optlen > tags[i].bv_len ))
{
- AC_MEMCPY( &langs[i+1], &langs[i],
- (nlang-i)*sizeof(struct berval) );
- langs[i].bv_val = opt;
- langs[i].bv_len = optlen;
+ AC_MEMCPY( &tags[i+1], &tags[i],
+ (ntags-i)*sizeof(struct berval) );
+ tags[i].bv_val = opt;
+ tags[i].bv_len = optlen;
goto done;
}
}
- if( nlang ) {
- AC_MEMCPY( &langs[1], &langs[0],
- nlang*sizeof(struct berval) );
+ if( ntags ) {
+ AC_MEMCPY( &tags[1], &tags[0],
+ ntags*sizeof(struct berval) );
}
- langs[0].bv_val = opt;
- langs[0].bv_len = optlen;
+ tags[0].bv_val = opt;
+ tags[0].bv_len = optlen;
done:;
- langlen += optlen + 1;
- nlang++;
+ tagslen += optlen + 1;
+ ntags++;
} else {
*text = "unrecognized option";
}
}
- if( nlang > 0 ) {
+ if( ntags > 0 ) {
int i;
- if( langlen > MAX_LANG_LEN ) {
+ if( tagslen > MAX_TAGS_LEN ) {
*text = "tagging options too long";
return rtn;
}
- desc.ad_lang.bv_val = langbuf;
- langlen = 0;
+ desc.ad_tags.bv_val = tagbuf;
+ tagslen = 0;
- for( i=0; i<nlang; i++ ) {
- AC_MEMCPY( &desc.ad_lang.bv_val[langlen],
- langs[i].bv_val, langs[i].bv_len );
+ for( i=0; i<ntags; i++ ) {
+ AC_MEMCPY( &desc.ad_tags.bv_val[tagslen],
+ tags[i].bv_val, tags[i].bv_len );
- langlen += langs[i].bv_len;
- desc.ad_lang.bv_val[langlen++] = ';';
+ tagslen += tags[i].bv_len;
+ desc.ad_tags.bv_val[tagslen++] = ';';
}
- desc.ad_lang.bv_val[--langlen] = '\0';
- desc.ad_lang.bv_len = langlen;
+ desc.ad_tags.bv_val[--tagslen] = '\0';
+ desc.ad_tags.bv_len = tagslen;
}
/* see if a matching description is already cached */
if( d2->ad_flags != desc.ad_flags ) {
continue;
}
- if( d2->ad_lang.bv_len != desc.ad_lang.bv_len ) {
+ if( d2->ad_tags.bv_len != desc.ad_tags.bv_len ) {
continue;
}
- if( d2->ad_lang.bv_len == 0 ) {
+ if( d2->ad_tags.bv_len == 0 ) {
break;
}
- if( strncasecmp( d2->ad_lang.bv_val, desc.ad_lang.bv_val,
- desc.ad_lang.bv_len ) == 0 )
+ if( strncasecmp( d2->ad_tags.bv_val, desc.ad_tags.bv_val,
+ desc.ad_tags.bv_len ) == 0 )
{
break;
}
for (d2 = desc.ad_type->sat_ad; d2; d2=d2->ad_next) {
if (d2->ad_flags != desc.ad_flags)
continue;
- if (d2->ad_lang.bv_len != desc.ad_lang.bv_len)
+ if (d2->ad_tags.bv_len != desc.ad_tags.bv_len)
continue;
- if (d2->ad_lang.bv_len == 0)
+ if (d2->ad_tags.bv_len == 0)
break;
- if (strncasecmp(d2->ad_lang.bv_val, desc.ad_lang.bv_val,
- desc.ad_lang.bv_len) == 0)
+ if (strncasecmp(d2->ad_tags.bv_val, desc.ad_tags.bv_val,
+ desc.ad_tags.bv_len) == 0)
break;
}
if (d2) {
/* Allocate a single contiguous block. If there are no
* options, we just need space for the AttrDesc structure.
* Otherwise, we need to tack on the full name length +
- * options length, + maybe language options length again.
+ * options length, + maybe tagging options length again.
*/
- if (desc.ad_lang.bv_len || desc.ad_flags != SLAP_DESC_NONE) {
+ if (desc.ad_tags.bv_len || desc.ad_flags != SLAP_DESC_NONE) {
dlen = desc.ad_type->sat_cname.bv_len + 1;
- if (desc.ad_lang.bv_len) {
- dlen += 1+desc.ad_lang.bv_len;
+ if (desc.ad_tags.bv_len) {
+ dlen += 1+desc.ad_tags.bv_len;
}
if( slap_ad_is_binary( &desc ) ) {
- dlen += sizeof(";binary")+desc.ad_lang.bv_len;
+ dlen += sizeof(";binary")+desc.ad_tags.bv_len;
}
}
d2 = ch_malloc(sizeof(AttributeDescription) + dlen);
+ d2->ad_next = NULL;
d2->ad_type = desc.ad_type;
d2->ad_flags = desc.ad_flags;
d2->ad_cname.bv_len = desc.ad_type->sat_cname.bv_len;
- d2->ad_lang.bv_len = desc.ad_lang.bv_len;
+ d2->ad_tags.bv_len = desc.ad_tags.bv_len;
if (dlen == 0) {
d2->ad_cname.bv_val = d2->ad_type->sat_cname.bv_val;
- d2->ad_lang.bv_val = NULL;
+ d2->ad_tags.bv_val = NULL;
} else {
char *cp, *op, *lp;
int j;
if( slap_ad_is_binary( &desc ) ) {
op = cp;
lp = NULL;
- if( desc.ad_lang.bv_len ) {
- lp = desc.ad_lang.bv_val;
+ if( desc.ad_tags.bv_len ) {
+ lp = desc.ad_tags.bv_val;
while( strncasecmp(lp, "binary", sizeof("binary")-1) < 0
&& (lp = strchr( lp, ';' )) != NULL )
++lp;
- if( lp != desc.ad_lang.bv_val ) {
+ if( lp != desc.ad_tags.bv_val ) {
*cp++ = ';';
j = (lp
- ? lp - desc.ad_lang.bv_val - 1
- : strlen( desc.ad_lang.bv_val ));
- strncpy(cp, desc.ad_lang.bv_val, j);
+ ? lp - desc.ad_tags.bv_val - 1
+ : strlen( desc.ad_tags.bv_val ));
+ strncpy(cp, desc.ad_tags.bv_val, j);
cp += j;
}
}
cp += strlen( cp );
}
d2->ad_cname.bv_len = cp - d2->ad_cname.bv_val;
- if( desc.ad_lang.bv_len )
+ if( desc.ad_tags.bv_len )
ldap_pvt_str2lower(op);
j = 1;
} else {
j = 0;
}
- if( desc.ad_lang.bv_len ) {
+ if( desc.ad_tags.bv_len ) {
lp = d2->ad_cname.bv_val + d2->ad_cname.bv_len + j;
if ( j == 0 )
*lp++ = ';';
- d2->ad_lang.bv_val = lp;
- strcpy(lp, desc.ad_lang.bv_val);
+ d2->ad_tags.bv_val = lp;
+ strcpy(lp, desc.ad_tags.bv_val);
ldap_pvt_str2lower(lp);
if( j == 0 )
- d2->ad_cname.bv_len += 1 + desc.ad_lang.bv_len;
+ d2->ad_cname.bv_len += 1 + desc.ad_tags.bv_len;
}
}
/* Add new desc to list. We always want the bare Desc with
return LDAP_SUCCESS;
}
-static int is_ad_sublang(
- struct berval *sublangbv,
- struct berval *suplangbv )
+static int is_ad_subtags(
+ struct berval *subtagsbv,
+ struct berval *suptagsbv )
{
- const char *suplang, *supp, *supdelimp;
- const char *sublang, *subp, *subdelimp;
+ const char *suptags, *supp, *supdelimp;
+ const char *subtags, *subp, *subdelimp;
int suplen, sublen;
- if( suplangbv->bv_len == 0 ) return 1;
- if( sublangbv->bv_len == 0 ) return 0;
+ if( suptagsbv->bv_len == 0 ) return 1;
+ if( subtagsbv->bv_len == 0 ) return 0;
- sublang =sublangbv->bv_val;
- suplang =suplangbv->bv_val;
+ subtags =subtagsbv->bv_val;
+ suptags =suptagsbv->bv_val;
- for( supp=suplang ; supp; supp=supdelimp ) {
+ for( supp=suptags ; supp; supp=supdelimp ) {
supdelimp = strchrlen( supp, ';', &suplen );
if( supdelimp ) supdelimp++;
- for( subp=sublang ; subp; subp=subdelimp ) {
+ for( subp=subtags ; subp; subp=subdelimp ) {
subdelimp = strchrlen( subp, ';', &sublen );
if( subdelimp ) subdelimp++;
}
/* ensure sub does support all flags of super */
- lr = sub->ad_lang.bv_len ? SLAP_DESC_LANG_RANGE : 0;
+ lr = sub->ad_tags.bv_len ? SLAP_DESC_TAG_RANGE : 0;
if(( super->ad_flags & ( sub->ad_flags | lr )) != super->ad_flags ) {
return 0;
}
- /* check for language tags */
- if ( !is_ad_sublang( &sub->ad_lang, &super->ad_lang )) {
+ /* check for tagging options */
+ if ( !is_ad_subtags( &sub->ad_tags, &super->ad_tags )) {
return 0;
}
bv->bv_len);
desc->ad_flags = SLAP_DESC_NONE;
- desc->ad_lang.bv_val = NULL;
- desc->ad_lang.bv_len = 0;
+ desc->ad_tags.bv_val = NULL;
+ desc->ad_tags.bv_len = 0;
desc->ad_cname.bv_len = bv->bv_len;
desc->ad_cname.bv_val = (char *)(desc+1);
int
ad_define_option( const char *name, const char *fname, int lineno )
{
- int i, j, len, optlen;
+ int i;
+ unsigned int optlen;
if ( options == &lang_option ) {
options = NULL;
} while ( name[++optlen] );
options = ch_realloc( options,
- (option_count+1) * sizeof(Attr_option) );
+ (option_count+1) * sizeof(Attr_option) );
if ( strcasecmp( name, "binary" ) == 0
|| ad_find_option_definition( name, optlen ) ) {
}
return NULL;
}
+
+MatchingRule *ad_mr(
+ AttributeDescription *ad,
+ unsigned usage )
+{
+ switch( usage & SLAP_MR_TYPE_MASK ) {
+ case SLAP_MR_NONE:
+ case SLAP_MR_EQUALITY:
+ return ad->ad_type->sat_equality;
+ break;
+ case SLAP_MR_ORDERING:
+ return ad->ad_type->sat_ordering;
+ break;
+ case SLAP_MR_SUBSTR:
+ return ad->ad_type->sat_substr;
+ break;
+ case SLAP_MR_EXT:
+ default:
+ assert( 0 /* ad_mr: bad usage */);
+ }
+ return NULL;
+}
projects / openldap / blobdiff