Bandaid ucdata build problems

[openldap] / include / ldif.h

diff --git a/include/ldif.h b/include/ldif.h
index ee0fac490312a63058b832602b1c3fafd357e7e9..4e67f71eb8807da5362f70a36410a7b008239a07 100644 (file)
--- a/include/ldif.h
+++ b/include/ldif.h
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -26,16 +27,17 @@
 
 LDAP_BEGIN_DECL
 
-extern int ldif_debug;
+/* This is NOT a bogus extern declaration (unlike ldap_debug) */
+LDAP_LDIF_V (int) ldif_debug;
 
 #define LDIF_LINE_WIDTH      76      /* maximum length of LDIF lines */
 
 /*
  * Macro to calculate maximum number of bytes that the base64 equivalent
- * of an item that is "vlen" bytes long will take up.  Base64 encoding
+ * of an item that is "len" bytes long will take up.  Base64 encoding
  * uses one byte for every six bits in the value plus up to two pad bytes.
  */
-#define LDIF_BASE64_LEN(vlen)  (((vlen) * 4 / 3 ) + 3)
+#define LDIF_BASE64_LEN(len)   (((len) * 4 / 3 ) + 3)
 
 /*
  * Macro to calculate maximum size that an LDIF-encoded type (length
@@ -43,31 +45,63 @@ extern int ldif_debug;
  * first newline + base64 value + continued lines.  Each continued line
  * needs room for a newline and a leading space character.
  */
-#define LDIF_SIZE_NEEDED(tlen,vlen) \
-    ((tlen) + 4 + LDIF_BASE64_LEN(vlen) \
-    + ((LDIF_BASE64_LEN(vlen) + (tlen) + 3) / LDIF_LINE_WIDTH * 2 ))
+#define LDIF_SIZE_NEEDED(nlen,vlen) \
+    ((nlen) + 4 + LDIF_BASE64_LEN(vlen) \
+    + ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / LDIF_LINE_WIDTH * 2 ))
 
-LDAP_F( int )
+LDAP_LDIF_F( int )
 ldif_parse_line LDAP_P((
        LDAP_CONST char *line,
-       char **type, char **value, int *vlen));
+       char **name,
+       char **value,
+       ber_len_t *vlen ));
 
-LDAP_F( char * )
+LDAP_LDIF_F( int )
+ldif_fetch_url LDAP_P((
+       LDAP_CONST char *line,
+       char **value,
+       ber_len_t *vlen ));
+
+LDAP_LDIF_F( char * )
 ldif_getline LDAP_P(( char **next ));
 
-LDAP_F( void )
-ldif_put_type_and_value LDAP_P((
+LDAP_LDIF_F( int )
+ldif_read_record LDAP_P((
+       FILE *fp,
+       int *lineno,
+       char **bufp,
+       int *buflen ));
+
+
+#define LDIF_PUT_NOVALUE       0x0000  /* no value */
+#define LDIF_PUT_VALUE         0x0001  /* value w/ auto detection */
+#define LDIF_PUT_TEXT          0x0002  /* assume text */
+#define        LDIF_PUT_BINARY         0x0004  /* assume binary (convert to base64) */
+#define LDIF_PUT_B64           0x0008  /* pre-converted base64 value */
+
+#define LDIF_PUT_COMMENT       0x0010  /* comment */
+#define LDIF_PUT_URL           0x0020  /* url */
+#define LDIF_PUT_SEP           0x0040  /* separator */
+
+LDAP_LDIF_F( void )
+ldif_sput LDAP_P((
        char **out,
-       LDAP_CONST char *t,
+       int type,
+       LDAP_CONST char *name,
        LDAP_CONST char *val,
-       int vlen ));
+       ber_len_t vlen ));
 
-LDAP_F( char * )
-ldif_type_and_value LDAP_P((
-       LDAP_CONST char *type,
+LDAP_LDIF_F( char * )
+ldif_put LDAP_P((
+       int type,
+       LDAP_CONST char *name,
        LDAP_CONST char *val,
-       int vlen ));
+       ber_len_t vlen ));
 
+LDAP_LDIF_F( int )
+ldif_is_not_printable LDAP_P((
+       LDAP_CONST char *val,
+       ber_len_t vlen ));
 
 LDAP_END_DECL