Modified to use libtool's ltdl instead of gmodule

[openldap] / servers / slapd / back-tcl / tcl_modify.c

diff --git a/servers/slapd/back-tcl/tcl_modify.c b/servers/slapd/back-tcl/tcl_modify.c
index 8b2c9147eb9ba3f1499d6d779c69bf8aa0524130..d82a4bbd2558fc58a72093965751ba4687977fbf 100644 (file)
--- a/servers/slapd/back-tcl/tcl_modify.c
+++ b/servers/slapd/back-tcl/tcl_modify.c
@@ -1,5 +1,6 @@
-/*
- * modify.c - tcl modify routines
+/* modify.c - tcl modify routines
+ *
+ * $Id: tcl_modify.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -16,7 +17,8 @@
 #include "slap.h"
 #include "tcl_back.h"
 
-int tcl_back_modify (
+int
+tcl_back_modify (
        Backend * be,
        Connection * conn,
        Operation * op,
@@ -30,24 +32,23 @@ int tcl_back_modify (
 
        if (ti->ti_modify == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "modify not implemented");
+                       "modify not implemented", NULL, NULL );
                return (-1);
        }
 
-       for ( i = 0; be->be_suffix[i] != NULL; i++ )
-               ;
-       suf_tcl = Tcl_Merge(i, be->be_suffix);
+       for (i = 0; be->be_suffix[i] != NULL; i++);
+       suf_tcl = Tcl_Merge (i, be->be_suffix);
 
-       tcl_mods = (char *) ch_malloc( BUFSIZ );
+       tcl_mods = (char *) ch_malloc (BUFSIZ);
        tcl_mods[0] = '\0';
        bsize = BUFSIZ;
        bp = tcl_mods;
 
-       for ( ; modlist != NULL; modlist = modlist->ml_next ) {
+       for (; modlist != NULL; modlist = modlist->ml_next) {
                LDAPMod *mods = &modlist->ml_mod;
                char *op = NULL;
 
-               switch ( mods->mod_op & ~LDAP_MOD_BVALUES ) {
+               switch (mods->mod_op & ~LDAP_MOD_BVALUES) {
                case LDAP_MOD_ADD:
                        op = "add";
                        break;
@@ -59,54 +60,58 @@ int tcl_back_modify (
                        break;
                }
 
-               len = strlen( mods->mod_type ) + strlen ( op ) + 7;
-               while ( bp + len - tcl_mods > bsize ) {
+               len = strlen (mods->mod_type) + strlen (op) + 7;
+               while (bp + len - tcl_mods > bsize) {
                        bsize += BUFSIZ;
-                       tcl_mods = (char *) ch_realloc( tcl_mods, bsize );
+                       tcl_mods = (char *) ch_realloc (tcl_mods, bsize);
                }
-               sprintf(bp, "{ {%s: %s} ", op, mods->mod_type);
+               sprintf (bp, "{ {%s: %s} ", op, mods->mod_type);
                bp += len;
-               for( i = 0;
-                       mods->mod_bvalues != NULL && mods->mod_bvalues[i] != NULL;
-                       i++ )
-               {
-                       len = strlen( mods->mod_type ) + strlen (
-                               mods->mod_bvalues[i]->bv_val ) + 5 +
-                               (mods->mod_bvalues[i+1] == NULL ? 2 : 0);
-                       while ( bp + len - tcl_mods > bsize ) {
+               for (i = 0;
+                       mods->mod_bvalues != NULL && mods->mod_bvalues[i]
+                       != NULL;
+                       i++) {
+                       len = strlen (mods->mod_type) + strlen (
+                               mods->mod_bvalues[i]->bv_val) + 5 +
+                               (mods->mod_bvalues[i + 1] == NULL ? 2 : 0);
+                       while (bp + len - tcl_mods > bsize) {
                                bsize += BUFSIZ;
-                               tcl_mods = (char *) ch_realloc( tcl_mods, bsize );
+                               tcl_mods = (char *) ch_realloc (tcl_mods, bsize);
                        }
-                       sprintf(bp, "{%s: %s} %s", mods->mod_type,
-                       mods->mod_bvalues[i]->bv_val, mods->mod_bvalues[i+1] ==
-                       NULL ? "} " : "");
+                       sprintf (bp, "{%s: %s} %s", mods->mod_type,
+                               mods->mod_bvalues[i]->bv_val,
+                               mods->mod_bvalues[i + 1] ==
+                               NULL ? "} " : "");
                        bp += len;
                }
        }
 
-       command = (char *) ch_malloc (strlen(ti->ti_modify) + strlen(suf_tcl)
-               + strlen(dn) + strlen(tcl_mods) + 64);
+       command = (char *) ch_malloc (strlen (ti->ti_modify) + strlen (suf_tcl)
+               + strlen (dn) + strlen (tcl_mods) + 64);
        /* This space is simply for aesthetics--\  */
-       sprintf(command, "%s MODIFY {%ld} {%s} {%s} { %s}",
+       sprintf (command, "%s MODIFY {%ld} {%s} {%s} { %s}",
                ti->ti_modify, op->o_msgid, suf_tcl, dn, tcl_mods);
-       Tcl_Free(suf_tcl);
-       free(tcl_mods);
+       Tcl_Free (suf_tcl);
+       free (tcl_mods);
 
-       ldap_pvt_thread_mutex_lock( &tcl_interpreter_mutex );
-       code = Tcl_GlobalEval(ti->ti_ii->interp, command);
-       results = (char *) strdup(ti->ti_ii->interp->result);
-       ldap_pvt_thread_mutex_unlock( &tcl_interpreter_mutex );
-       free(command);
+       ldap_pvt_thread_mutex_lock (&tcl_interpreter_mutex);
+       code = Tcl_GlobalEval (ti->ti_ii->interp, command);
+       results = (char *) ch_strdup (ti->ti_ii->interp->result);
+       ldap_pvt_thread_mutex_unlock (&tcl_interpreter_mutex);
+       free (command);
 
        if (code != TCL_OK) {
                err = LDAP_OPERATIONS_ERROR;
-               Debug(LDAP_DEBUG_ANY, "tcl_modify_error: %s\n", results, 0, 0);
+               Debug (LDAP_DEBUG_SHELL, "tcl_modify_error: %s\n", results,
+                       0, 0);
        } else {
-               interp_send_results ( be, conn, op, results, NULL, 0 );
+               interp_send_results (be, conn, op, results, NULL, 0);
        }
 
        if (err != LDAP_SUCCESS)
-               send_ldap_result (conn, op, err, NULL, "internal backend error");
+               send_ldap_result (conn, op, err, NULL,
+                       "internal backend error", NULL, NULL );
 
-       return (0);
+       free (results);
+       return (err);
 }