If we are using lutil_lock functions then define NEED_SIMPLE_LOCKING or

[openldap] / libraries / liblutil / setproctitle.c

diff --git a/libraries/liblutil/setproctitle.c b/libraries/liblutil/setproctitle.c
index 8c5ed0700c30d896ff7dc7a481b09d4f1802c7dc..4c13eb95d16dc5fc49036f8ad02b91719c49f5e0 100644 (file)
--- a/libraries/liblutil/setproctitle.c
+++ b/libraries/liblutil/setproctitle.c
@@ -2,15 +2,12 @@
 
 #ifndef HAVE_SETPROCTITLE
 
+#include <stdio.h>
 #include <stdlib.h>
 
-#if defined( HAVE_STDARG_H ) && __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 #include <ac/setproctitle.h>
+#include <ac/string.h>
+#include <ac/stdarg.h>
 
 /*
  * Copyright (c) 1990,1991 Regents of the University of Michigan.
@@ -34,11 +31,10 @@ int Argc;           /* original argc */
 
 /* VARARGS */
 void setproctitle
-#if defined( HAVE_STDARG_H ) && __STDC__
+#if defined( HAVE_STDARG )
        ( const char *fmt, ... )
 #else
-       ( fmt, va_alist )
-const char *fmt;
+       ( va_alist )
 va_dcl
 #endif
 {
@@ -48,14 +44,24 @@ va_dcl
        char    buf[ 1024 ];
        va_list ap;
 
-#if defined( HAVE_STDARG_H ) && __STDC__
+#if defined( HAVE_STDARG )
        va_start(ap, fmt);
 #else
+       const char *fmt;
+
        va_start(ap);
+       fmt = va_arg(ap, const char *);
 #endif
 
+#ifdef HAVE_VSNPRINTF
        buf[sizeof(buf) - 1] = '\0';
        vsnprintf( buf, sizeof(buf)-1, fmt, ap );
+#elif HAVE_VPRINTF
+       vsprintf( buf, fmt, ap ); /* hope it's not too long */
+#else
+       /* use doprnt() */
+       chokeme = "choke me!  I don't have a doprnt() manual handy";
+#endif
 
        va_end(ap);