X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Flock.c;h=9ef0fd7f78a48fc0b536539e350611a51d36da48;hb=a070e6c05ff054ea047defc78fe60ec2d67c4565;hp=17bc995efaa650bebcfd43f62f4820a9726c579a;hpb=177367bdb14913abb1ce90d44758f0390f626a92;p=openldap
diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index 17bc995efa..9ef0fd7f78 100644
--- 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 .
+ *
+ * Copyright 1998-2006 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
+ * .
+ */
+/* 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
+#include
#include
#include
#include
#include
+#ifdef HAVE_SYS_FILE_H
#include
-#include
-
-#include "../slapd/slap.h"
+#endif
+#include "slurp.h"
FILE *
lock_fopen(
- char *fname,
- char *type,
+ const char *fname,
+ const char *type,
FILE **lfp
)
{
@@ -41,8 +59,8 @@ 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 ) {
Debug( LDAP_DEBUG_ANY,
"Error: could not open \"%s\"\n", buf, 0, 0 );
@@ -50,24 +68,15 @@ lock_fopen(
}
/* 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,
"Error: could not open \"%s\"\n", fname, 0, 0 );
-#ifdef HAVE_FLOCK
- flock( fileno( *lfp ), LOCK_UN );
-#else
- lockf( fileno( *lfp ), F_ULOCK, 0 );
-#endif
+ ldap_unlockf( fileno(*lfp) );
+ fclose( *lfp );
+ *lfp = NULL;
return( NULL );
}
@@ -82,15 +91,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 );
}
@@ -100,15 +107,15 @@ lock_fclose(
*/
int
acquire_lock(
- char *file,
+ const char *file,
FILE **rfp,
FILE **lfp
)
{
if (( *rfp = lock_fopen( file, "r+", lfp )) == NULL ) {
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);
return( -1 );
}
return( 0 );
@@ -122,15 +129,15 @@ acquire_lock(
*/
int
relinquish_lock(
- char *file,
+ const char *file,
FILE *rfp,
FILE *lfp
)
{
if ( lock_fclose( rfp, lfp ) == EOF ) {
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 );
return( -1 );
}
return( 0 );