upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 17:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ldif2ldbm bugfix from Randy Kunkee <kunkee@pluto.ops.NeoSoft.com>

Browse source
This commit is contained in:
Kurt Zeilenga 1998-11-30 22:26:11 +00:00
parent acd3231d58
commit 8a884d1b9c
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/tools/ldif2id2children.c
View file

@ -1,7 +1,9 @@
#include "portable.h"
#include <stdio.h>
#include <stdlib.h>
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/socket.h>
#include <ac/unistd.h>
@ -163,7 +165,11 @@ main( int argc, char **argv )
}
if ( line[0] == '\n' || stop && buf && *buf ) {
if ( *buf != '\n' ) {
id++;
if (isdigit(*buf)) {
id = atol(buf);
} else {
id++;
}
s = buf;
elineno = 0;
while ( (linep = str_getline( &s )) != NULL ) {

18
servers/slapd/tools/ldif2id2entry.c
View file

@ -1,7 +1,9 @@
#include "portable.h"
#include <stdio.h>
#include <stdlib.h>
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/socket.h>
#include <ac/unistd.h>
@ -144,8 +146,13 @@ main( int argc, char **argv )
len = strlen( line );
if ( buf == NULL || *buf == '\0' ) {
sprintf( idbuf, "%lu\n", id + 1 );
idlen = strlen( idbuf );
if (!isdigit(line[0])) {
sprintf( idbuf, "%d\n", id + 1 );
idlen = strlen( idbuf );
} else {
id = atol(line) - 1;
idlen = 0;
}
} else {
idlen = 0;
}
@ -166,11 +173,16 @@ main( int argc, char **argv )
}
if ( line[0] == '\n' || stop && buf && *buf ) {
if ( *buf != '\n' ) {
int len;
id++;
key.dptr = (char *) &id;
key.dsize = sizeof(ID);
data.dptr = buf;
data.dsize = strlen( buf ) + 1;
len = strlen(buf);
if (buf[len - 1] == '\n')
buf[--len] = '\0';
data.dsize = len + 1;
if ( ldbm_store( db->dbc_db, key, data,
LDBM_INSERT ) != 0 ) {
fputs("id2entry ldbm_store failed\n",

8
servers/slapd/tools/ldif2index.c
View file

@ -1,7 +1,9 @@
#include "portable.h"
#include <stdio.h>
#include <stdlib.h>
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/socket.h>
#include <ac/unistd.h>
@ -151,7 +153,11 @@ main( int argc, char **argv )
}
if ( line[0] == '\n' || stop && buf && *buf ) {
if ( *buf != '\n' ) {
id++;
if (isdigit(*buf)) {
id = atol(buf);
} else {
id++;
}
s = buf;
elineno = 0;
while ( (linep = str_getline( &s )) != NULL ) {