/* TimesTen */
char backsql_check_dn_ru_query[] = "SELECT dn_ru from ldap_entries";
-struct berval *
-backsql_strcat( struct berval *dest, ber_len_t *buflen, ... )
+struct berbuf *
+backsql_strcat( struct berbuf *dest, ... )
{
va_list strs;
ber_len_t cdlen, cslen, grow;
char *cstr;
assert( dest );
- assert( dest->bv_val == NULL
- || dest->bv_len == strlen( dest->bv_val ) );
+ assert( dest->bb_val.bv_val == NULL
+ || dest->bb_val.bv_len == strlen( dest->bb_val.bv_val ) );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "==>backsql_strcat()\n" );
#endif /* BACKSQL_TRACE */
- va_start( strs, buflen );
- if ( dest->bv_val == NULL || *buflen == 0 ) {
- dest->bv_val = (char *)ch_calloc( BACKSQL_STR_GROW,
+ va_start( strs, dest );
+ if ( dest->bb_val.bv_val == NULL || dest->bb_len == 0 ) {
+ dest->bb_val.bv_val = (char *)ch_calloc( BACKSQL_STR_GROW,
sizeof( char ) );
- dest->bv_len = 0;
- *buflen = BACKSQL_STR_GROW;
+ dest->bb_val.bv_len = 0;
+ dest->bb_len = BACKSQL_STR_GROW;
}
- cdlen = dest->bv_len;
+ cdlen = dest->bb_val.bv_len;
while ( ( cstr = va_arg( strs, char * ) ) != NULL ) {
cslen = strlen( cstr );
grow = BACKSQL_MAX( BACKSQL_STR_GROW, cslen );
- if ( *buflen - cdlen <= cslen ) {
+ if ( dest->bb_len - cdlen <= cslen ) {
char *tmp_dest;
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "backsql_strcat(): "
"buflen=%d, cdlen=%d, cslen=%d "
"-- reallocating dest\n",
- *buflen, cdlen + 1, cslen );
+ dest->bb_len, cdlen + 1, cslen );
#endif /* BACKSQL_TRACE */
- tmp_dest = (char *)ch_realloc( dest->bv_val,
- ( *buflen ) + grow * sizeof( char ) );
+ tmp_dest = (char *)ch_realloc( dest->bb_val.bv_val,
+ ( dest->bb_len ) + grow * sizeof( char ) );
if ( tmp_dest == NULL ) {
Debug( LDAP_DEBUG_ANY, "backsql_strcat(): "
"could not reallocate string buffer.\n",
0, 0, 0 );
return NULL;
}
- dest->bv_val = tmp_dest;
- *buflen += grow;
+ dest->bb_val.bv_val = tmp_dest;
+ dest->bb_len += grow;
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "backsql_strcat(): "
- "new buflen=%d, dest=%p\n", *buflen, dest, 0 );
+ "new buflen=%d, dest=%p\n", dest->bb_len, dest, 0 );
#endif /* BACKSQL_TRACE */
}
- AC_MEMCPY( dest->bv_val + cdlen, cstr, cslen + 1 );
+ AC_MEMCPY( dest->bb_val.bv_val + cdlen, cstr, cslen + 1 );
cdlen += cslen;
}
va_end( strs );
dest, 0, 0 );
#endif /* BACKSQL_TRACE */
- dest->bv_len = cdlen;
+ dest->bb_val.bv_len = cdlen;
return dest;
}
-struct berval *
-backsql_strfcat( struct berval *dest, ber_len_t *buflen, const char *fmt, ... )
+struct berbuf *
+backsql_strfcat( struct berbuf *dest, const char *fmt, ... )
{
va_list strs;
ber_len_t cdlen;
assert( dest );
- assert( buflen );
assert( fmt );
- assert( *buflen == 0 || *buflen > dest->bv_len );
- assert( dest->bv_val == NULL
- || dest->bv_len == strlen( dest->bv_val ) );
+ assert( dest->bb_len == 0 || dest->bb_len > dest->bb_val.bv_len );
+ assert( dest->bb_val.bv_val == NULL
+ || dest->bb_val.bv_len == strlen( dest->bb_val.bv_val ) );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "==>backsql_strfcat()\n" );
#endif /* BACKSQL_TRACE */
va_start( strs, fmt );
- if ( dest->bv_val == NULL || *buflen == 0 ) {
- dest->bv_val = (char *)ch_calloc( BACKSQL_STR_GROW,
+ if ( dest->bb_val.bv_val == NULL || dest->bb_len == 0 ) {
+ dest->bb_val.bv_val = (char *)ch_calloc( BACKSQL_STR_GROW,
sizeof( char ) );
- dest->bv_len = 0;
- *buflen = BACKSQL_STR_GROW;
+ dest->bb_val.bv_len = 0;
+ dest->bb_len = BACKSQL_STR_GROW;
}
- cdlen = dest->bv_len;
+ cdlen = dest->bb_val.bv_len;
for ( ; fmt[0]; fmt++ ) {
ber_len_t cslen, grow;
char *cstr, cc[ 2 ] = { '\0', '\0' };
}
grow = BACKSQL_MAX( BACKSQL_STR_GROW, cslen );
- if ( *buflen - cdlen <= cslen ) {
+ if ( dest->bb_len - cdlen <= cslen ) {
char *tmp_dest;
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "backsql_strfcat(): "
"buflen=%d, cdlen=%d, cslen=%d "
"-- reallocating dest\n",
- *buflen, cdlen + 1, cslen );
+ dest->bb_len, cdlen + 1, cslen );
#endif /* BACKSQL_TRACE */
- tmp_dest = (char *)ch_realloc( dest->bv_val,
- ( *buflen ) + grow * sizeof( char ) );
+ tmp_dest = (char *)ch_realloc( dest->bb_val.bv_val,
+ ( dest->bb_len ) + grow * sizeof( char ) );
if ( tmp_dest == NULL ) {
Debug( LDAP_DEBUG_ANY, "backsql_strfcat(): "
"could not reallocate string buffer.\n",
0, 0, 0 );
return NULL;
}
- dest->bv_val = tmp_dest;
- *buflen += grow * sizeof( char );
+ dest->bb_val.bv_val = tmp_dest;
+ dest->bb_len += grow * sizeof( char );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "backsql_strfcat(): "
- "new buflen=%d, dest=%p\n", *buflen, dest, 0 );
+ "new buflen=%d, dest=%p\n", dest->bb_len, dest, 0 );
#endif /* BACKSQL_TRACE */
}
assert( cstr );
- AC_MEMCPY( dest->bv_val + cdlen, cstr, cslen + 1 );
+ AC_MEMCPY( dest->bb_val.bv_val + cdlen, cstr, cslen + 1 );
cdlen += cslen;
}
dest, 0, 0 );
#endif /* BACKSQL_TRACE */
- dest->bv_len = cdlen;
+ dest->bb_val.bv_len = cdlen;
return dest;
}
backsql_entry_addattr(
Entry *e,
struct berval *at_name,
- struct berval *at_val )
+ struct berval *at_val,
+ void *memctx )
{
AttributeDescription *ad;
int rc;
return 0;
}
- rc = attr_mergeit_one( e, ad, at_val );
+ rc = attr_merge_normalize_one( e, ad, at_val, memctx );
if ( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "backsql_entry_addattr(): "
backsql_get_table_spec( char **p )
{
char *s, *q;
- struct berval res = BER_BVNULL;
- ber_len_t res_len = 0;
+ struct berbuf res = BB_NULL;
assert( p );
assert( *p );
#define BACKSQL_NEXT_WORD { \
while ( *s && isspace( (unsigned char)*s ) ) s++; \
- if ( !*s ) return res.bv_val; \
+ if ( !*s ) return res.bb_val.bv_val; \
q = s; \
while ( *q && !isspace( (unsigned char)*q ) ) q++; \
if ( *q ) *q++='\0'; \
BACKSQL_NEXT_WORD;
/* table name */
- backsql_strcat( &res, &res_len, s, NULL );
+ backsql_strcat( &res, s, NULL );
s = q;
BACKSQL_NEXT_WORD;
}
#if 0
- backsql_strcat( &res, &res_len, " AS ", s, NULL );
+ backsql_strcat( &res, " AS ", s, NULL );
/* oracle doesn't understand AS :( */
#endif
/* table alias */
- backsql_strfcat( &res, &res_len, "cs", ' ', s );
+ backsql_strfcat( &res, "cs", ' ', s );
- return res.bv_val;
+ return res.bb_val.bv_val;
}
int
backsql_merge_from_clause(
- struct berval *dest_from,
- ber_len_t *dest_len,
+ struct berbuf *dest_from,
struct berval *src_from )
{
char *s, *p, *srcc, *pos, e;
- struct berval res = { 0 , NULL };
+ struct berbuf res = BB_NULL;
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "==>backsql_merge_from_clause(): "
"dest_from='%s',src_from='%s'\n",
- dest_from ? dest_from->bv_val : "<NULL>", src_from, 0 );
+ dest_from ? dest_from->bb_val.bv_val : "<NULL>", src_from, 0 );
#endif /* BACKSQL_TRACE */
srcc = ch_strdup( src_from->bv_val );
"p='%s' s='%s'\n", p, s, 0 );
#endif /* BACKSQL_TRACE */
- if ( res.bv_val == NULL ) {
- backsql_strcat( &res, dest_len, s, NULL );
+ if ( res.bb_val.bv_val == NULL ) {
+ backsql_strcat( &res, s, NULL );
} else {
- pos = strstr( res.bv_val, s );
- if ( pos == NULL ) {
- backsql_strfcat( &res, dest_len, "cs", ',', s );
- } else if ( ( e = pos[ strlen( s ) ] ) != '\0' && e != ',' ) {
- backsql_strfcat( &res, dest_len, "cs", ',', s );
+ pos = strstr( res.bb_val.bv_val, s );
+ if ( pos == NULL || ( ( e = pos[ strlen( s ) ] ) != '\0' && e != ',' ) ) {
+ backsql_strfcat( &res, "cs", ',', s );
}
}
BerVarray values,
struct berval *res )
{
- ber_len_t len = 0;
int i;
+ struct berbuf bb = BB_NULL;
- res->bv_val = NULL;
- res->bv_len = 0;
+ assert( res );
for ( i = 0; values[i].bv_val; i++ ) {
if ( split_pattern[i].bv_val == NULL ) {
+ ch_free( bb.bb_val.bv_val );
return -1;
}
- backsql_strfcat( res, &len, "b", &split_pattern[ i ] );
- backsql_strfcat( res, &len, "b", &values[ i ] );
+ backsql_strfcat( &bb, "b", &split_pattern[ i ] );
+ backsql_strfcat( &bb, "b", &values[ i ] );
}
if ( split_pattern[ i ].bv_val == NULL ) {
+ ch_free( bb.bb_val.bv_val );
return -1;
}
- backsql_strfcat( res, &len, "b", &split_pattern[ i ] );
+ backsql_strfcat( &bb, "b", &split_pattern[ i ] );
+
+ *res = bb.bb_val;
return 0;
}
projects / openldap / blobdiff