Cleanup #ifdefs

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index d8c9c8d6e73aebda12caeb485a376a248bff563b..b32b77e8a21d84ead80a64cd76a21ead2b4bfd5e 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 LDAP_BEGIN_DECL
 
 /* n octets encode into ceiling(n/3) * 4 bytes */
-/* Avoid floating point math by through extra padding */
+/* Avoid floating point math through extra padding */
 
-#define LUTIL_BASE64_ENCODE_LEN(n)     ((n)/3 * 4 + 4)
-#define LUTIL_BASE64_DECODE_LEN(n)     ((n)/4 * 3)
+#define LUTIL_BASE64_ENCODE_LEN(n)     (((n)+2)/3 * 4)
+#define LUTIL_BASE64_DECODE_LEN(n)     (((n)+3)/4 * 3)
 
 /* ISC Base64 Routines */
 /* base64.c */
@@ -56,9 +56,15 @@ lutil_entropy LDAP_P((
        unsigned char *buf,
        ber_len_t nbytes ));
 
-/* passwd.c */
+/* passfile.c */
 struct berval; /* avoid pulling in lber.h */
 
+LDAP_LUTIL_F( int )
+lutil_get_filed_password LDAP_P((
+       const char *filename,
+       struct berval * ));
+
+/* passwd.c */
 LDAP_LUTIL_F( int )
 lutil_authpasswd LDAP_P((
        const struct berval *passwd,    /* stored password */
@@ -106,6 +112,19 @@ lutil_progname LDAP_P((
        int argc,
        char *argv[] ));
 
+LDAP_LUTIL_F( char* )
+lutil_strcopy LDAP_P(( char *dst, const char *src ));
+
+LDAP_LUTIL_F( char* )
+lutil_strncopy LDAP_P(( char *dst, const char *src, size_t n ));
+
+struct tm;
+
+/* use this macro to statically allocate buffer for lutil_gentime */
+#define LDAP_LUTIL_GENTIME_BUFSIZE     22
+LDAP_LUTIL_F( size_t )
+lutil_gentime LDAP_P(( char *s, size_t max, const struct tm *tm ));
+
 #ifndef HAVE_MKSTEMP
 LDAP_LUTIL_F( int )
 mkstemp LDAP_P (( char * template ));
@@ -116,10 +135,14 @@ LDAP_LUTIL_F( int )
 lutil_pair( ber_socket_t sd[2] );
 
 /* uuid.c */
+/* use this macro to allocate buffer for lutil_uuidstr */
+#define LDAP_LUTIL_UUIDSTR_BUFSIZE     40
 LDAP_LUTIL_F( size_t )
 lutil_uuidstr( char *buf, size_t len );
 
 /* csn.c */
+/* use this macro to allocate buffer for lutil_csnstr */
+#define LDAP_LUTIL_CSNSTR_BUFSIZE      64
 LDAP_LUTIL_F( size_t )
 lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );
 
@@ -145,6 +168,16 @@ LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hSLAPDServiceStatus;
 
 #endif /* HAVE_NT_SERVICE_MANAGER */
 
+#ifdef HAVE_EBCDIC
+/* Generally this has only been used to put '\n' to stdout. We need to
+ * make sure it is output in EBCDIC.
+ */
+#undef putchar
+#undef putc
+#define putchar(c)     putc((c), stdout)
+#define putc(c,fp)     do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)
+#endif
+
 LDAP_END_DECL
 
 #endif /* _LUTIL_H */