Patch: More format bugs (ITS#1702)

[openldap] / libraries / libldap / ftest.c

diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index 69c2a4f6fce982ae71311e7db2a1cf60379b5f43..587c0638bfe6d6993105ab18dadad39aafc1722a 100644 (file)
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* OpenLDAP Filter API Test */
@@ -15,35 +15,33 @@
 
 #include <ldap.h>
 
-#include "ldap-int.h"
+#include "ldap_pvt.h"
 
 #include "ldif.h"
 #include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
-static int filter2ber( const char *filter );
+static int filter2ber( char *filter );
 
 int usage()
 {
        fprintf( stderr, "usage:\n"
-               "       ftest [filter]" );
+               "  ftest [-d n] filter\n"
+               "    filter - RFC 2254 string representation of an "
+                       "LDAP search filter\n" );
        return EXIT_FAILURE;
 }
 
 int
 main( int argc, char *argv[] )
 {
-       int i, debug=0, ber=0;
+       int c;
+       int debug=0;
        char *filter=NULL;
 
-    while( (i = getopt( argc, argv, "Aa:Ss:"
-        "bd:" )) != EOF )
-    {
-               switch ( i ) {
-               case 'b':
-                       ber++;
-                       break;
+    while( (c = getopt( argc, argv, "d:" )) != EOF ) {
+               switch ( c ) {
                case 'd':
                        debug = atoi( optarg );
                        break;
@@ -69,44 +67,45 @@ main( int argc, char *argv[] )
                }
        }
 
-       if( argc - optind > 1 ) {
+       if ( argc - optind != 1 ) {
                return usage();
-       } else if ( argc - optind == 1 ) {
-               if( ber ) {
-                       fprintf( stderr, "ftest: parameter %s unexpected\n",
-                               argv[optind] );
-                       return usage();
-               }
-               return filter2ber( argv[optind] );
        }
 
-       return EXIT_FAILURE;
+       return filter2ber( strdup( argv[optind] ) );
 }
 
-static int filter2ber( const char *filter )
+static int filter2ber( char *filter )
 {
        int rc;
-       BerElement *ber = ber_alloc_t( LBER_USE_DER );
        struct berval *bv = NULL;
+       BerElement *ber;
 
+       printf( "Filter: %s\n", filter );
+
+       ber = ber_alloc_t( LBER_USE_DER );
        if( ber == NULL ) {
                perror( "ber_alloc_t" );
                return EXIT_FAILURE;
        }
 
-       rc = ldap_int_put_filter( ber, (char *) filter );
-
-       ber_dump( ber, 0 );
+       rc = ldap_pvt_put_filter( ber, filter );
+       if( rc < 0 ) {
+               fprintf( stderr, "Filter error!\n");
+               return EXIT_FAILURE;
+       }
 
        rc = ber_flatten( ber, &bv );
-
        if( rc < 0 ) {
                perror( "ber_flatten" );
                return EXIT_FAILURE;
        }
 
-       ber_free( ber, 1 );
+       printf( "BER encoding (len=%ld):\n", (long) bv->bv_len );
+       ber_bprint( bv->bv_val, bv->bv_len );
+
+       ber_free( ber, 0 );
        ber_bvfree( bv );
 
        return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+