ITS#3534, 3546, 3571 revert abandon behavior

[openldap] / servers / slurpd / lock.c

diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index 3e41854eb0dadaae5b5a4965d99b7ea2df0fe582..4e95008ab388590ae85b7aefc2bb49ee9c945738 100644 (file)
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -9,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).
+ */
 
 /*
  * lock.c - routines to open and apply an advisory lock to a file
@@ -18,22 +35,23 @@
 
 #include <stdio.h>
 
+#include <ac/param.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/param.h>
-
-#include "../slapd/slap.h"
+#endif
 
+#include "slurp.h"
 
 
 FILE *
 lock_fopen(
-    char       *fname,
-    char       *type,
+    const char *fname,
+    const char *type,
     FILE       **lfp
 )
 {
@@ -41,33 +59,32 @@ lock_fopen(
        char    buf[MAXPATHLEN];
 
        /* open the lock file */
-       strcpy( buf, fname );
-       strcat( buf, ".lock" );
+       snprintf( buf, sizeof buf, "%s.lock", fname );
+
        if ( (*lfp = fopen( buf, "w" )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( SLURPD, ERR, "lock_fopen: "
+                       "Error: could not open \"%s\"\n", buf, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "Error: 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,
+#ifdef NEW_LOGGING
+               LDAP_LOG ( SLURPD, ERR, "lock_fopen: "
                        "Error: could not open \"%s\"\n", fname, 0, 0 );
-#ifdef HAVE_FLOCK
-               flock( fileno( *lfp ), LOCK_UN );
 #else
-               lockf( fileno( *lfp ), F_ULOCK, 0 );
+               Debug( LDAP_DEBUG_ANY,
+                       "Error: could not open \"%s\"\n", fname, 0, 0 );
 #endif
+               ldap_unlockf( fileno(*lfp) );
                fclose( *lfp );
                *lfp = NULL;
                return( NULL );
@@ -84,15 +101,13 @@ lock_fclose(
     FILE       *lfp
 )
 {
+       int rc = fclose( fp );
+
        /* 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 ) );
+       return( rc );
 }
 
 
@@ -102,15 +117,21 @@ lock_fclose(
  */
 int
 acquire_lock(
-    char       *file,
+    const char *file,
     FILE       **rfp,
     FILE       **lfp
 )
 {
     if (( *rfp = lock_fopen( file, "r+", lfp )) == NULL ) {
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ERR, "acquire_lock: "
+               "Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
+               (long) getpid(), file, 0 );
+#else
        Debug( LDAP_DEBUG_ANY,
-               "Error: acquire_lock(%d): Could not acquire lock on \"%s\"\n",
-               getpid(), file, 0);
+               "Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
+               (long) getpid(), file, 0);
+#endif
        return( -1 );
     }
     return( 0 );
@@ -124,15 +145,21 @@ acquire_lock(
  */
 int
 relinquish_lock(
-    char       *file,
+    const char *file,
     FILE       *rfp,
     FILE       *lfp
 )
 {
     if ( lock_fclose( rfp, lfp ) == EOF ) {
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ERR, "relinguish_lock: "
+               "Error: relinquish_lock (%ld): Error closing \"%s\"\n",
+               (long) getpid(), file, 0 );
+#else
        Debug( LDAP_DEBUG_ANY,
-               "Error: relinquish_lock (%d): Error closing \"%s\"\n",
-               getpid(), file, 0 );
+               "Error: relinquish_lock (%ld): Error closing \"%s\"\n",
+               (long) getpid(), file, 0 );
+#endif
        return( -1 );
     }
     return( 0 );