upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-02 21:19:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Used new ldap_(un)lockf() functions

Browse source
This commit is contained in:
Ben Collins 1999-03-13 20:34:27 +00:00
parent 75d6e3f738
commit 0924180fa8
2 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/lock.c
View file

@ -9,7 +9,9 @@
#include <ac/time.h>
#include <ac/unistd.h>
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
#include <sys/param.h>
#include "slap.h"
@ -28,22 +30,14 @@ lock_fopen( char *fname, char *type, FILE **lfp )
}
/* acquire the lock */
#ifdef HAVE_FLOCK
while ( flock( fileno( *lfp ), LOCK_EX ) != 0 ) {
#else
while ( lockf( fileno( *lfp ), F_LOCK, 0 ) != 0 ) {
#endif
while ( ldap_lockf( *lfp ) != 0 ) {
; /* NULL */
}
/* 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 );
#else
lockf( fileno( *lfp ), F_ULOCK, 0 );
#endif
ldap_unlockf( *lfp );
fclose( *lfp );
*lfp = NULL;
return( NULL );
@ -56,11 +50,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( lfp );
fclose( lfp );
return( fclose( fp ) );

18
servers/slurpd/lock.c
View file

@ -53,11 +53,7 @@ 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
while ( ldap_lockf( *lfp ) != 0 )
{
; /* NULL */
}
@ -66,11 +62,7 @@ lock_fopen(
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( *lfp );
fclose( *lfp );
*lfp = NULL;
return( NULL );
@ -88,11 +80,7 @@ lock_fclose(
)
{
/* unlock */
#ifdef HAVE_FLOCK
flock( fileno( lfp ), LOCK_UN );
#else
lockf( fileno( lfp ), F_ULOCK, 0 );
#endif
ldap_unlockf( lfp );
fclose( lfp );
return( fclose( fp ) );