Modify ad_cmp() macro to support use as an ordering function.

[openldap] / servers / slapd / lock.c

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index f634b220aa3026518a5e849b037b0a5c38df7dc8..bc8a4fc8a4089b4b28f2a92b248d155a7d90b67c 100644 (file)
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,4 +1,9 @@
 /* lock.c - routines to open and apply an advisory lock to a file */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -9,41 +14,44 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/param.h>
+#endif
+
 #include "slap.h"
 
 FILE *
-lock_fopen( char *fname, char *type, FILE **lfp )
+lock_fopen( const char *fname, const char *type, FILE **lfp )
 {
        FILE    *fp;
        char    buf[MAXPATHLEN];
 
        /* open the lock file */
-       strcpy( buf, fname );
-       strcat( buf, ".lock" );
+       strcpy(slap_strcopy( buf, fname ), ".lock" );
        if ( (*lfp = fopen( buf, "w" )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "lock_fopen: could not open lock file \"%s\".\n", buf ));
+#else
                Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", buf, 0, 0 );
+#endif
+
                return( NULL );
        }
 
        /* acquire the lock */
-#ifdef HAVE_FLOCK
-       while ( flock( fileno( *lfp ), LOCK_EX ) != 0 ) {
-#else
-       while ( lockf( fileno( *lfp ), F_LOCK, 0 ) != 0 ) {
-#endif
-               ;       /* NULL */
-       }
+       ldap_lockf( fileno(*lfp) );
 
        /* open the log file */
        if ( (fp = fopen( fname, type )) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
-#ifdef HAVE_FLOCK
-               flock( fileno( *lfp ), LOCK_UN );
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "lock_fopen: could not open log file \"%s\".\n", buf ));
 #else
-               lockf( fileno( *lfp ), F_ULOCK, 0 );
+               Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
 #endif
+
+               ldap_unlockf( fileno(*lfp) );
                fclose( *lfp );
                *lfp = NULL;
                return( NULL );
@@ -56,11 +64,7 @@ int
 lock_fclose( FILE *fp, FILE *lfp )
 {
        /* unlock */
-#ifdef HAVE_FLOCK
-       flock( fileno( lfp ), LOCK_UN );
-#else
-       lockf( fileno( lfp ), F_ULOCK, 0 );
-#endif
+       ldap_unlockf( fileno(lfp) );
        fclose( lfp );
 
        return( fclose( fp ) );