/* entry.c - routines for dealing with entries */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
static unsigned char *ecur; /* pointer to end of currently used ebuf */
static int emaxsize;/* max size of ebuf */
+int entry_destroy(void)
+{
+ free( ebuf );
+ ebuf = NULL;
+ ecur = NULL;
+ emaxsize = 0;
+ return 0;
+}
+
Entry *
-str2entry( char *s )
+str2entry( char *s )
{
- int id = 0;
Entry *e;
Attribute **a;
char *type;
char *value;
char *next;
- int vlen, nvals, maxvals;
+ ber_len_t vlen;
+ int nvals, maxvals;
struct berval bval;
struct berval *vals[2];
char ptype[64];
/*
- * In string format, an entry looks like this:
+ * LDIF is used as the string format.
+ * An entry looks like this:
*
- * <id>\n
* dn: <dn>\n
* [<attr>:[:] <value>\n]
* [<tab><continuedvalue>\n]*
Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
s ? s : "NULL", 0, 0 );
- /* check to see if there's an id included */
next = s;
- if ( isdigit( (unsigned char) *s ) ) {
- id = atoi( s );
- if ( (s = ldif_getline( &next )) == NULL ) {
- Debug( LDAP_DEBUG_TRACE,
- "<= str2entry NULL (missing newline after id)\n",
- 0, 0, 0 );
- return( NULL );
- }
- }
/* initialize reader/writer lock */
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
return( NULL );
}
- e->e_id = id;
+ e->e_id = NOID;
e->e_private = NULL;
/* dn + attributes */
}
if ( strcasecmp( type, "dn" ) == 0 ) {
+ free( type );
+
if ( e->e_dn != NULL ) {
Debug( LDAP_DEBUG_ANY,
"str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
- e->e_id, e->e_dn, value );
+ e->e_id, e->e_dn,
+ value != NULL ? value : NULL );
+ if( value != NULL ) free( value );
continue;
}
- e->e_dn = ch_strdup( value );
+ e->e_dn = value != NULL ? value : ch_strdup( "" );
if ( e->e_ndn != NULL ) {
Debug( LDAP_DEBUG_ANY,
"str2entry: entry %ld already has a normalized dn \"%s\" for \"%s\" (first ignored)\n",
- e->e_id, e->e_ndn, value );
+ e->e_id, e->e_ndn,
+ value != NULL ? value : NULL );
free( e->e_ndn );
}
- e->e_ndn = ch_strdup( value );
+ e->e_ndn = ch_strdup( e->e_dn );
(void) dn_normalize_case( e->e_ndn );
continue;
}
Debug( LDAP_DEBUG_TRACE,
"<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
entry_free( e );
+ free( value );
+ free( type );
return( NULL );
}
+
+ free( value );
+ free( type );
nvals++;
}
char *
entry2str(
Entry *e,
- int *len,
- int printid
-)
+ int *len )
{
Attribute *a;
struct berval *bv;
ecur = ebuf;
- if ( printid ) {
- /* id + newline */
- MAKE_SPACE( 10 );
- sprintf( (char *) ecur, "%ld\n", e->e_id );
- ecur = (unsigned char *) strchr( (char *) ecur, '\0' );
- }
-
/* put the dn */
if ( e->e_dn != NULL ) {
/* put "dn: <dn>" */
tmplen = strlen( e->e_dn );
MAKE_SPACE( LDIF_SIZE_NEEDED( 2, tmplen ));
- ldif_put_type_and_value( (char **) &ecur, "dn", e->e_dn, tmplen );
+ ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, "dn", e->e_dn, tmplen );
}
/* put the attributes */
bv = a->a_vals[i];
tmplen = strlen( a->a_type );
MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len ));
- ldif_put_type_and_value( (char **) &ecur, a->a_type,
+ ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, a->a_type,
bv->bv_val, bv->bv_len );
}
}