mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-03-07 14:18:15 +08:00
Move nt_debug to -llutil and generalize for all platforms.
This commit is contained in:
parent
24c39b31b6
commit
0b924192e7
@ -3,8 +3,9 @@
|
||||
##
|
||||
|
||||
LIBRARY = liblutil.a
|
||||
SRCS = base64.c detach.c md5.c passwd.c sha1.c getpass.c lockf.c
|
||||
OBJS = base64.o detach.o md5.o passwd.o sha1.o getpass.o lockf.o @LIBOBJS@
|
||||
SRCS = base64.c debug.c detach.c md5.c passwd.c sha1.c getpass.c lockf.c
|
||||
OBJS = base64.o debug.o detach.o md5.o passwd.o sha1.o getpass.o lockf.o \
|
||||
@LIBOBJS@
|
||||
|
||||
LDAP_INCDIR= ../../include
|
||||
LDAP_LIBDIR= ../../libraries
|
||||
|
70
libraries/liblutil/debug.c
Normal file
70
libraries/liblutil/debug.c
Normal file
@ -0,0 +1,70 @@
|
||||
/*
|
||||
* Copyright (c) 1996, 1998 by Internet Software Consortium.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
||||
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
||||
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||||
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "portable.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <ac/stdarg.h>
|
||||
#include <ac/string.h>
|
||||
|
||||
#include "ldap_log.h"
|
||||
#include "ldap_defaults.h"
|
||||
|
||||
static FILE *log_file;
|
||||
|
||||
int lutil_debug_file( FILE *file )
|
||||
{
|
||||
log_file = log_file;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void (lutil_debug)( int level, int debug, const char *fmt, ... )
|
||||
{
|
||||
char buffer[4096];
|
||||
va_list vl;
|
||||
|
||||
if ( !(level & debug ) )
|
||||
return;
|
||||
|
||||
#ifdef HAVE_WINSOCK
|
||||
if( log_file == NULL )
|
||||
{
|
||||
log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "slapd.log", "w" );
|
||||
|
||||
if ( log_file == NULL )
|
||||
log_file = fopen( "slapd.log", "w" );
|
||||
|
||||
if ( log_file == NULL )
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
va_start( vl, fmt );
|
||||
|
||||
vsnprintf( buffer, sizeof(buffer), fmt, vl );
|
||||
buffer[sizeof(buffer)-1] = '\0';
|
||||
|
||||
if( log_file != NULL ) {
|
||||
fputs( buffer, log_file );
|
||||
fflush( log_file );
|
||||
}
|
||||
|
||||
puts(buffer );
|
||||
va_end( vl );
|
||||
}
|
@ -1,54 +0,0 @@
|
||||
|
||||
#include "portable.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <ac/stdarg.h>
|
||||
#include <ac/string.h>
|
||||
|
||||
#include "slap.h"
|
||||
#include "ldap_defaults.h"
|
||||
|
||||
static FILE *log_file;
|
||||
|
||||
int lutil_debug_file( FILE *file )
|
||||
{
|
||||
log_file = log_file;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void (lutil_debug)( int level, int debug, const char *fmt, ... )
|
||||
{
|
||||
char buffer[4096];
|
||||
va_list vl;
|
||||
|
||||
if ( !(level & debug ) )
|
||||
return;
|
||||
|
||||
#ifdef HAVE_WINSOCK
|
||||
if( log_file == NULL )
|
||||
{
|
||||
log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "slapd.log", "w" );
|
||||
|
||||
if ( log_file == NULL )
|
||||
log_file = fopen( "slapd.log", "w" );
|
||||
|
||||
if ( log_file == NULL )
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
va_start( vl, fmt );
|
||||
|
||||
vsnprintf( buffer, sizeof(buffer), fmt, vl );
|
||||
buffer[sizeof(buffer)-1] = '\0';
|
||||
|
||||
if( log_file != NULL ) {
|
||||
fputs( buffer, log_file );
|
||||
fflush( log_file );
|
||||
}
|
||||
|
||||
puts(buffer );
|
||||
va_end( vl );
|
||||
}
|
Loading…
Reference in New Issue
Block a user