From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 3 Jun 1999 01:03:52 +0000 (+0000)
Subject: s/DEFAULT_DIRSEP/DIRSEP/
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~417
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=acd57577f4231f7358be6a0dfc4e9def71e8f05f;p=openldap

s/DEFAULT_DIRSEP/DIRSEP/
---

diff --git a/servers/slapd/back-bdb2/startup.c b/servers/slapd/back-bdb2/startup.c
index a34974eb59..b1901bdd3f 100644
--- a/servers/slapd/back-bdb2/startup.c
+++ b/servers/slapd/back-bdb2/startup.c
@@ -45,11 +45,11 @@ bdb2i_back_startup_internal(
 					DB_INIT_LOCK | DB_INIT_MPOOL );
 
 	/*  make sure, dbhome is an absolute path  */
-	if ( *lty->lty_dbhome != *DEFAULT_DIRSEP ) {
+	if ( *lty->lty_dbhome != *DIRSEP ) {
 		char   cwd[MAXPATHLEN];
 
 		(void) getcwd( cwd, MAXPATHLEN );
-		sprintf( cwd, "%s%s%s", cwd, DEFAULT_DIRSEP, lty->lty_dbhome );
+		sprintf( cwd, "%s%s%s", cwd, DIRSEP, lty->lty_dbhome );
 		free( lty->lty_dbhome );
 		lty->lty_dbhome = ch_strdup( cwd );
 
@@ -159,11 +159,11 @@ bdb2i_back_db_startup_internal(
 
 	/*  if the data directory is not an absolute path, have it relative
         to the current working directory (which should not be configured !)  */
-	if ( *li->li_directory != *DEFAULT_DIRSEP ) {
+	if ( *li->li_directory != *DIRSEP ) {
 		char   cwd[MAXPATHLEN];
 
 		(void) getcwd( cwd, MAXPATHLEN );
-		sprintf( cwd, "%s%s%s", cwd, DEFAULT_DIRSEP, li->li_directory );
+		sprintf( cwd, "%s%s%s", cwd, DIRSEP, li->li_directory );
 		free( li->li_directory );
 		li->li_directory = ch_strdup( cwd );
 
diff --git a/servers/slapd/back-bdb2/txn.c b/servers/slapd/back-bdb2/txn.c
index 635b6667b1..1782c8eac0 100644
--- a/servers/slapd/back-bdb2/txn.c
+++ b/servers/slapd/back-bdb2/txn.c
@@ -51,7 +51,7 @@ bdb2i_init_db_file_cache( struct ldbminfo *li, BDB2_TXN_FILES *fileinfo )
 
 	fileinfo->dbc_refcnt = 1;
 
-	sprintf( buf, "%s%s%s", li->li_directory, DEFAULT_DIRSEP,
+	sprintf( buf, "%s%s%s", li->li_directory, DIRSEP,
 					fileinfo->dbc_name );
 	if ( stat( buf, &st ) == 0 ) {
 		fileinfo->dbc_blksize = st.st_blksize;
@@ -134,7 +134,7 @@ bdb2i_txn_attr_config(
 
 				/*  re-use filename to get the complete path  */
 				sprintf( fileName, "%s%s%s",
-							li->li_directory, DEFAULT_DIRSEP, p->dbc_name );
+							li->li_directory, DIRSEP, p->dbc_name );
 
 				/*  since we have an mpool, we should not define a cache size */
 				p->dbc_db = bdb2i_db_open( fileName, DB_TYPE,
@@ -181,7 +181,7 @@ bdb2i_open_nextid( BackendDB *be )
 	char            fileName[MAXPATHLEN];
 
 	sprintf( fileName, "%s%s%s",
-				li->li_directory, DEFAULT_DIRSEP, NEXTID_NAME );
+				li->li_directory, DIRSEP, NEXTID_NAME );
 
 	/*  try to open the file for read and write  */
 	memset( &dbinfo, 0, sizeof( dbinfo ));
@@ -225,7 +225,7 @@ bdb2i_txn_open_files( BackendDB *be )
 		char   fileName[MAXPATHLEN];
 
 		sprintf( fileName, "%s%s%s",
-					li->li_directory, DEFAULT_DIRSEP, dbFile->dbc_name );
+					li->li_directory, DIRSEP, dbFile->dbc_name );
 
 		/*  since we have an mpool, we should not define a cache size */
 		dbFile->dbc_db = bdb2i_db_open( fileName, DB_TYPE,