tinyrad-dict: removing utility

5 files changed, 1 insertions, 305 deletions

diff --git a/Makefile.am b/Makefile.am
index 612de70..c10a08d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,7 +105,6 @@ EXTRA_PROGRAMS				= examples/socket-example \
 EXTRA                                   = lib/libtinyrad.a \
                                           lib/libtinyrad.la \
                                           src/tinyrad \
-                                          src/tinyrad-dict \
                                           src/tinyrad-url \
                                           src/tinyradproxy \
                                           include/tinyrad.h
@@ -207,9 +206,6 @@ else
 endif
 if ENABLE_TINYRAD
    bin_PROGRAMS                         += src/tinyrad
-endif
-if ENABLE_TINYRAD_DICT
-   bin_PROGRAMS                         += src/tinyrad-dict
    TESTS                                += tests/test-dict-defaults.sh
 endif
 if ENABLE_TINYRAD_URL
@@ -306,13 +302,6 @@ src_tinyrad_SOURCES			= $(noinst_HEADERS) $(include_HEADERS) \
                                           src/tinyrad.c
 
 
-# macros for src/tinyrad-dict
-src_tinyrad_dict_DEPENDENCIES           = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
-src_tinyrad_dict_LDADD                  = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
-src_tinyrad_dict_SOURCES                = $(noinst_HEADERS) $(include_HEADERS) \
-                                          src/tinyrad-dict.c
-
-
 # macros for src/tinyrad-url
 src_tinyrad_url_DEPENDENCIES            = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
 src_tinyrad_url_LDADD                   = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
diff --git a/acinclude.m4 b/acinclude.m4
index 4b2a169..cc01489 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -39,7 +39,6 @@ AC_DEFUN([AC_TINYRAD_COMMON],[dnl
    AC_REQUIRE([AC_TINYRAD_DOCUMENTATION])
    AC_REQUIRE([AC_TINYRAD_LIBTINYRAD])
    AC_REQUIRE([AC_TINYRAD_TINYRAD])
-   AC_REQUIRE([AC_TINYRAD_TINYRAD_DICT])
    AC_REQUIRE([AC_TINYRAD_TINYRAD_URL])
    AC_REQUIRE([AC_TINYRAD_TINYRADPROXY])
 
@@ -47,7 +46,6 @@ AC_DEFUN([AC_TINYRAD_COMMON],[dnl
    if   test "x${ENABLE_DOCUMENATION}" = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_LIBTINYRAD}"   = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_TINYRAD}"      = "xyes";then ENABLE_TINYRAD_COMMON="yes"
-   elif test "x${ENABLE_TINYRAD_DICT}" = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_TINYRAD_URL}"  = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    elif test "x${ENABLE_TINYRADPROXY}" = "xyes";then ENABLE_TINYRAD_COMMON="yes"
    fi;
@@ -218,37 +216,6 @@ AC_DEFUN([AC_TINYRAD_TINYRAD],[dnl
 ])dnl
 
 
-# AC_TINYRAD_TINYRAD_DICT()
-# ______________________________________________________________________________
-AC_DEFUN([AC_TINYRAD_TINYRAD_DICT],[dnl
-
-   AC_REQUIRE([AC_TINYRAD_UTILITIES])
-
-   enableval=""
-   AC_ARG_ENABLE(
-      tinyrad-dict,
-      [AS_HELP_STRING([--enable-tinyrad-dict], [enable tinyrad-dict utility])],
-      [ ETINYRADDICT=$enableval ],
-      [ ETINYRADDICT=$enableval ]
-   )
-
-   if test "x${ETINYRADDICT}" == "xyes";then
-      ENABLE_TINYRAD_DICT="yes"
-   elif test "x${ETINYRADDICT}" == "xno";then
-      ENABLE_TINYRAD_DICT="no"
-   elif test "x${ENABLE_UTILITIES}" == "xyes";then
-      ENABLE_TINYRAD_DICT="yes"
-   elif test "x${ENABLE_UTILITIES}" == "xno";then
-      ENABLE_TINYRAD_DICT="no"
-   else
-      ENABLE_TINYRAD_DICT="no"
-   fi
-
-   AM_CONDITIONAL([ENABLE_TINYRAD_DICT],  [test "$ENABLE_TINYRAD_DICT" = "yes"])
-   AM_CONDITIONAL([DISABLE_TINYRAD_DICT], [test "$ENABLE_TINYRAD_DICT" = "no"])
-])dnl
-
-
 # AC_TINYRAD_TINYRAD_URL()
 # ______________________________________________________________________________
 AC_DEFUN([AC_TINYRAD_TINYRAD_URL],[dnl
diff --git a/configure.ac b/configure.ac
index 70b244f..bc7592e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,6 @@ AC_TINYRAD_LIBTINYRAD
 AC_TINYRAD_UTILITIES
 AC_TINYRAD_TINYRAD
 AC_TINYRAD_TINYRADPROXY
-AC_TINYRAD_TINYRAD_DICT
 AC_TINYRAD_TINYRAD_URL
 AC_TINYRAD_EXAMPLES
 AC_TINYRAD_DOCUMENTATION
@@ -223,7 +222,6 @@ AC_MSG_NOTICE([      Build examples             ${ENABLE_EXAMPLES}])
 AC_MSG_NOTICE([      Install extra docs         ${ENABLE_DOCUMENATION}])
 AC_MSG_NOTICE([      Install libtinyrad.la      ${ENABLE_LIBTINYRAD}])
 AC_MSG_NOTICE([      Install tinyrad            ${ENABLE_TINYRAD}])
-AC_MSG_NOTICE([      Install tinyrad-dict       ${ENABLE_TINYRAD_DICT}])
 AC_MSG_NOTICE([      Install tinyrad-url        ${ENABLE_TINYRAD_URL}])
 AC_MSG_NOTICE([      Install tinyradproxy       ${ENABLE_TINYRADPROXY}])
 AC_MSG_NOTICE([      Install common files       ${ENABLE_TINYRAD_COMMON}])
diff --git a/src/tinyrad-dict.c b/src/tinyrad-dict.c
deleted file mode 100644
index ea76f77..0000000
--- a/src/tinyrad-dict.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- *  Tiny RADIUS Client Library
- *  Copyright (C) 2021 David M. Syzdek <david@syzdek.net>.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of David M. Syzdek nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *  SUCH DAMAGE.
- */
-#define _SRC_UTILITIES_TINYRAD_C 1
-
-
-///////////////
-//           //
-//  Headers  //
-//           //
-///////////////
-#pragma mark - Headers
-
-#include <tinyrad_utils.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-#include <getopt.h>
-
-
-///////////////////
-//               //
-//  Definitions  //
-//               //
-///////////////////
-#pragma mark - Definitions
-
-#undef PROGRAM_NAME
-#define PROGRAM_NAME "tinyrad"
-
-#define MY_OPT_DICT_DEFAULTS  0x0001
-#define MY_OPT_DICT_DUMP      0x0002
-
-
-//////////////////
-//              //
-//  Prototypes  //
-//              //
-//////////////////
-#pragma mark - Prototypes
-
-int main( int argc, char * argv[] );
-
-void my_usage( void );
-
-
-/////////////////
-//             //
-//  Functions  //
-//             //
-/////////////////
-#pragma mark - Functions
-
-int main(int argc, char * argv[])
-{
-   int            opt;
-   int            c;
-   int            opt_index;
-   int            rc;
-   int            opts;
-   unsigned       tr_opts;
-   TinyRadDict *  dict;
-   size_t         pos;
-   char **        errs;
-   char **        paths;
-   char **        files;
-
-   // getopt options
-   static char          short_opt[] = "d:D:hI:qVv";
-   static struct option long_opt[] =
-   {
-      {"debug",            optional_argument, NULL, 'd' },
-      {"help",             no_argument,       NULL, 'h' },
-      {"quiet",            no_argument,       NULL, 'q' },
-      {"silent",           no_argument,       NULL, 'q' },
-      {"version",          no_argument,       NULL, 'V' },
-      {"verbose",          no_argument,       NULL, 'v' },
-      {"defaults",         no_argument,       NULL,  2  },
-      {"dictionary-dump",  no_argument,       NULL,  1  },
-      { NULL, 0, NULL, 0 }
-   };
-
-   trutils_initialize(PROGRAM_NAME);
-
-   opts     = 0;
-   tr_opts  = 0;
-   paths    = NULL;
-   files    = NULL;
-
-   while((c = getopt_long(argc, argv, short_opt, long_opt, &opt_index)) != -1)
-   {
-      switch(c)
-      {
-         case -1:       /* no more arguments */
-         case 0:        /* long options toggles */
-         break;
-
-         case 1:
-         opts |= MY_OPT_DICT_DUMP;
-         break;
-
-         case 2:
-         tr_opts |= TRAD_BUILTIN_DICT;
-         break;
-
-         case 'D':
-         if (tinyrad_strsadd(&files, optarg) != TRAD_SUCCESS)
-         {
-            fprintf(stderr, "%s: out of virtual memory\n", PROGRAM_NAME);
-            tinyrad_strsfree(files);
-            tinyrad_strsfree(paths);
-            return(trutils_exit_code(TRAD_ENOMEM));
-         };
-         break;
-
-         case 'd':
-         opt = ((optarg)) ? (int)strtol(optarg, NULL, 0) : TRAD_DEBUG_ANY;
-         tinyrad_set_option(NULL, TRAD_OPT_DEBUG_LEVEL, &opt);
-         break;
-
-         case 'h':
-         my_usage();
-         return(0);
-
-         case 'I':
-         if (tinyrad_strsadd(&paths, optarg) != TRAD_SUCCESS)
-         {
-            fprintf(stderr, "%s: out of virtual memory\n", PROGRAM_NAME);
-            tinyrad_strsfree(files);
-            tinyrad_strsfree(paths);
-            return(trutils_exit_code(TRAD_ENOMEM));
-         };
-         break;
-
-         case 'V':
-         trutils_version();
-         return(0);
-
-         case 'q':
-         opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRUTILS_OPT_VERBOSE;
-         break;
-
-         case 'v':
-         opts |=  TRUTILS_OPT_VERBOSE;
-         opts &= ~TRUTILS_OPT_QUIET;
-         break;
-
-         case '?':
-         fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-         return(trutils_exit_code(TRAD_EUNKNOWN));
-
-         default:
-         fprintf(stderr, "%s: unrecognized option `--%c'\n", PROGRAM_NAME, c);
-         fprintf(stderr, "Try `%s --help' for more information.\n", PROGRAM_NAME);
-         return(trutils_exit_code(TRAD_EUNKNOWN));
-      };
-   };
-
-   // initialize dictionary
-   if ((rc = tinyrad_dict_initialize(&dict, tr_opts)) != TRAD_SUCCESS)
-   {
-      tinyrad_strsfree(files);
-      tinyrad_strsfree(paths);
-      fprintf(stderr, "%s: out of virtual memory\n", PROGRAM_NAME);
-      return(trutils_exit_code(rc));
-   };
-
-   // add paths
-   for(pos = 0; ( ((paths)) && ((paths[pos])) ); pos++)
-   {
-      if ((rc = tinyrad_dict_add_path(dict, paths[pos])) != TRAD_SUCCESS)
-      {
-         tinyrad_strsfree(paths);
-         tinyrad_strsfree(files);
-         tinyrad_free(dict);
-         trutils_error(opts, NULL, "%s: %s", optarg, tinyrad_strerror(rc));
-         return(trutils_exit_code(rc));
-      };
-   };
-
-   // add dictionary files
-   for(pos = 0; ( ((files)) && ((files[pos])) ); pos++)
-   {
-      if ((rc = tinyrad_dict_parse(dict, files[pos], &errs, 0)) != TRAD_SUCCESS)
-      {
-         trutils_error(opts, errs, NULL);
-         tinyrad_strsfree(errs);
-         tinyrad_strsfree(paths);
-         tinyrad_strsfree(files);
-         tinyrad_free(dict);
-         return(trutils_exit_code(rc));
-      };
-   };
-
-   // dump dictionary
-   if ((opts & MY_OPT_DICT_DUMP))
-      tinyrad_dict_print(dict, 0xffff);
-
-   // frees resources
-   tinyrad_strsfree(paths);
-   tinyrad_strsfree(files);
-   tinyrad_free(dict);
-
-   return(0);
-}
-
-
-void my_usage(void)
-{
-   printf("Usage: %s [OPTIONS]\n", PROGRAM_NAME);
-   printf("OPTIONS:\n");
-   printf("  -D dictionary             include dictionary\n");
-   printf("  -d level, --debug=level   print debug messages\n");
-   printf("  -h, --help                print this help and exit\n");
-   printf("  -I path                   add path to dictionary search paths\n");
-   printf("  -q, --quiet, --silent     do not print messages\n");
-   printf("  -V, --version             print version number and exit\n");
-   printf("  -v, --verbose             print verbose messages\n");
-   printf("  --defaults                load default dictionaries\n");
-   printf("  --dictionary-dump         print imported dictionaries\n");
-   printf("\n");
-   return;
-}
-
-
-/* end of source */
diff --git a/tests/test-dict-defaults.sh b/tests/test-dict-defaults.sh
index 7a681b9..70c1c95 100755
--- a/tests/test-dict-defaults.sh
+++ b/tests/test-dict-defaults.sh
@@ -32,7 +32,7 @@
 
 CODE=0
 
-test -x src/tinyrad-dict || exit 77
+test -x src/tinyrad || exit 77
 
 TINYRADNOINIT=1
 export TINYRADNOINIT