nt_err.c has moved from lutil to lber

[openldap] / libraries / liblber / options.c

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 4546861619dc8b2e4551e740be95f269d789271c..62f4fcf4175924b61167020b732c12673d5bbab8 100644 (file)
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -1,14 +1,19 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
+#include <ac/string.h>
 
 #include "lber-int.h"
 
-int ber_int_debug = 0;
+extern void * ber_pvt_err_file;        /* bprint.c */
+
+struct lber_options ber_int_options = {
+       LBER_UNINITIALIZED, 0, 0 };
 
 int
 ber_get_option(
@@ -16,11 +21,14 @@ ber_get_option(
        int             option,
        void    *outvalue)
 {
-       BerElement *ber;
-       Sockbuf *sb;
+       LDAP_CONST BerElement *ber;
+       LDAP_CONST Sockbuf *sb;
+
+       ber_int_options.lbo_valid = LBER_INITIALIZED;
 
        if(outvalue == NULL) {
                /* no place to get to */
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
@@ -30,23 +38,39 @@ ber_get_option(
                        return LBER_OPT_SUCCESS;
                }
 
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
-       ber = (BerElement *) item;
-       sb = (Sockbuf *) item;
+       ber = item;
+       sb = item;
 
        switch(option) {
        case LBER_OPT_BER_OPTIONS:
+               assert( BER_VALID( ber ) );
                * (int *) outvalue = ber->ber_options;
                return LBER_OPT_SUCCESS;
 
        case LBER_OPT_BER_DEBUG:
+               assert( BER_VALID( ber ) );
                * (int *) outvalue = ber->ber_debug;
                return LBER_OPT_SUCCESS;
 
+       case LBER_OPT_BER_REMAINING_BYTES:
+               *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_ptr;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_TOTAL_BYTES:
+               *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_buf;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_BYTES_TO_WRITE:
+               *((ber_len_t *) outvalue) = ber->ber_ptr - ber->ber_buf;
+               return LBER_OPT_SUCCESS;
+
        default:
                /* bad param */
+               ber_errno = LBER_ERROR_PARAM;
                break;
        }
 
@@ -57,43 +81,95 @@ int
 ber_set_option(
        void    *item,
        int             option,
-       void    *invalue)
+       LDAP_CONST void *invalue)
 {
        BerElement *ber;
        Sockbuf *sb;
 
+       if( (ber_int_options.lbo_valid == LBER_UNINITIALIZED)
+               && ( ber_int_memory_fns == NULL )
+               && ( option == LBER_OPT_MEMORY_FNS )
+               && ( invalue != NULL ))
+       {
+               const BerMemoryFunctions *f =
+                       (const BerMemoryFunctions *) invalue;
+
+               /* make sure all functions are provided */
+               if(!( f->bmf_malloc && f->bmf_calloc
+                       && f->bmf_realloc && f->bmf_free ))
+               {
+                       ber_errno = LBER_ERROR_PARAM;
+                       return LBER_OPT_ERROR;
+               }
+
+               ber_int_memory_fns = (BerMemoryFunctions *)
+                       (*(f->bmf_malloc))(sizeof(BerMemoryFunctions));
+
+               if ( ber_int_memory_fns == NULL ) {
+                       ber_errno = LBER_ERROR_MEMORY;
+                       return LBER_OPT_ERROR;
+               }
+
+               memcpy(ber_int_memory_fns, f, sizeof(BerMemoryFunctions));
+
+               ber_int_options.lbo_valid = LBER_INITIALIZED;
+               return LBER_OPT_SUCCESS;
+       }
+
+       ber_int_options.lbo_valid = LBER_INITIALIZED;
+
        if(invalue == NULL) {
                /* no place to set from */
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
        if(item == NULL) {
                if(option == LBER_OPT_BER_DEBUG) {
-                       ber_int_debug = * (int *) invalue;
+                       ber_int_debug = * (const int *) invalue;
                        return LBER_OPT_SUCCESS;
 
                } else if(option == LBER_OPT_LOG_PRINT_FN) {
                        ber_pvt_log_print = (BER_LOG_PRINT_FN) invalue;
                        return LBER_OPT_SUCCESS;
+               } else if(option == LBER_OPT_LOG_PRINT_FILE) {
+                       ber_pvt_err_file = (void *) invalue;
+                       return LBER_OPT_SUCCESS;
                }
 
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
-       ber = (BerElement *) item;
-       sb = (Sockbuf *) item;
+       ber = item;
+       sb = item;
 
        switch(option) {
        case LBER_OPT_BER_OPTIONS:
-               ber->ber_options = * (int *) invalue;
+               assert( BER_VALID( ber ) );
+               ber->ber_options = * (const int *) invalue;
                return LBER_OPT_SUCCESS;
 
        case LBER_OPT_BER_DEBUG:
-               ber->ber_debug = * (int *) invalue;
+               assert( BER_VALID( ber ) );
+               ber->ber_debug = * (const int *) invalue;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_REMAINING_BYTES:
+               ber->ber_end = &ber->ber_ptr[* (const ber_len_t *) invalue];
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_TOTAL_BYTES:
+               ber->ber_end = &ber->ber_buf[* (const ber_len_t *) invalue];
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_BYTES_TO_WRITE:
+               ber->ber_ptr = &ber->ber_buf[* (const ber_len_t *) invalue];
                return LBER_OPT_SUCCESS;
 
        default:
                /* bad param */
+               ber_errno = LBER_ERROR_PARAM;
                break;
        }