X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Freplog.c;h=53a82f64e4ec6bf15809b16b370ccf727820d59a;hb=4abbf9c610d4fbaeee0dbdceaad1e0f94ed8e8fe;hp=703c6bad37cb4bcb26b8e1bd96752f5bbfa042a1;hpb=a93a15d9fc460963c111f66cf0f3995e5a2f5d42;p=openldap
diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c
index 703c6bad37..53a82f64e4 100644
--- a/servers/slurpd/replog.c
+++ b/servers/slurpd/replog.c
@@ -1,10 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,10 @@
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
/*
@@ -24,6 +36,7 @@
#include
+#include
#include
#include
#include
@@ -66,7 +79,7 @@ copy_replog(
* with a fatal error.
*/
strcpy( buf, src );
- if (( p = strrchr( buf, '/' )) == NULL ) {
+ if (( p = strrchr( buf, LDAP_DIRSEP[0] )) == NULL ) {
strcpy( buf, "." );
} else {
*p = '\0';
@@ -78,7 +91,7 @@ copy_replog(
return( -1 );
}
strcpy( buf, dst );
- if (( p = strrchr( buf, '/' )) == NULL ) {
+ if (( p = strrchr( buf, LDAP_DIRSEP[0] )) == NULL ) {
strcpy( buf, "." );
} else {
*p = '\0';
@@ -102,9 +115,9 @@ copy_replog(
/* lock dst */
dfp = lock_fopen( dst, "a", &dlfp );
if ( dfp == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "Error: copy_replog: Can't lock replog \"%s\" for write: %s\n",
- src, sys_errlist[ errno ], 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "Error: copy_replog: Can't lock replog \"%s\" for write: %s\n",
+ dst, sys_errlist[ errno ], 0 );
lock_fclose( rfp, lfp );
return( 1 );
}
@@ -112,7 +125,7 @@ copy_replog(
/*
* Make our own private copy of the replication log.
*/
- while (( p = fgets( rbuf, sizeof( buf ), rfp )) != NULL ) {
+ while (( p = fgets( rbuf, sizeof( rbuf ), rfp )) != NULL ) {
fputs( rbuf, dfp );
}
/* Only truncate the source file if we're not in one-shot mode */
@@ -122,9 +135,9 @@ copy_replog(
}
if ( lock_fclose( dfp, dlfp ) == EOF ) {
- Debug( LDAP_DEBUG_ANY,
- "Error: copy_replog: Error closing \"%s\"\n",
- src, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "Error: copy_replog: Error closing \"%s\"\n",
+ dst, 0, 0 );
}
if ( lock_fclose( rfp, lfp ) == EOF ) {
Debug( LDAP_DEBUG_ANY,