From 8c25026a61da8cdddb22a643a255f20872da07b3 Mon Sep 17 00:00:00 2001
From: "David M. Syzdek" <david@syzdek.net>
Date: Mon, 13 Jun 2022 14:42:51 -0800
Subject: tinytac: replacing tinytacb_XXX() with bindle_XXX()

---
 src/ttu/tinytacutil.c   | 12 ++++++++----
 src/ttu/widget-acct.c   |  6 +++++-
 src/ttu/widget-authen.c |  6 +++++-
 src/ttu/widget-author.c |  6 +++++-
 src/ttu/widget-config.c |  6 +++++-
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/ttu/tinytacutil.c b/src/ttu/tinytacutil.c
index db15b76..21bb498 100644
--- a/src/ttu/tinytacutil.c
+++ b/src/ttu/tinytacutil.c
@@ -54,7 +54,11 @@
 #include <errno.h>
 
 #include <tinytac.h>
-#include <bindle_prefix.h>
+#ifdef HAVE_BINDLE_PREFIX_H
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
 
 
 ///////////////////
@@ -339,7 +343,7 @@ ttu_file2str(
    str[sb.st_size] = '\0';
    close(fd);
 
-   tinytacb_strchomp(str, NULL);
+   bindle_strchomp(str, NULL);
 
    return(str);
 }
@@ -367,11 +371,11 @@ ttu_password(
    // prompt for password
    if ((cnf->opts & TTUTILS_OPT_PASSPROMPT))
    {
-      if ((pass = tinytacb_getpass("Enter TACACS+ Password: ")) == NULL)
+      if ((pass = bindle_getpass("Enter TACACS+ Password: ")) == NULL)
          return(ttu_error(cnf, 1, "getpass: %s", strerror(errno)));
       if ((cnf->pass_buff))
          free(cnf->pass_buff);
-      if ((cnf->pass_buff = tinytacb_strdup(pass)) == NULL)
+      if ((cnf->pass_buff = bindle_strdup(pass)) == NULL)
          return(ttu_error(cnf, 1, "%s", strerror(errno)));
       cnf->pass = cnf->pass_buff;
    };
diff --git a/src/ttu/widget-acct.c b/src/ttu/widget-acct.c
index 32bc821..dce5bde 100644
--- a/src/ttu/widget-acct.c
+++ b/src/ttu/widget-acct.c
@@ -49,7 +49,11 @@
 #include <errno.h>
 
 #include <tinytac.h>
-#include <bindle_prefix.h>
+#ifdef HAVE_BINDLE_PREFIX_H
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
 
 
 ///////////////////
diff --git a/src/ttu/widget-authen.c b/src/ttu/widget-authen.c
index 0c722f9..dbbd9c0 100644
--- a/src/ttu/widget-authen.c
+++ b/src/ttu/widget-authen.c
@@ -49,7 +49,11 @@
 #include <errno.h>
 
 #include <tinytac.h>
-#include <bindle_prefix.h>
+#ifdef HAVE_BINDLE_PREFIX_H
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
 
 
 ///////////////////
diff --git a/src/ttu/widget-author.c b/src/ttu/widget-author.c
index 0f2d351..ebdab4a 100644
--- a/src/ttu/widget-author.c
+++ b/src/ttu/widget-author.c
@@ -49,7 +49,11 @@
 #include <errno.h>
 
 #include <tinytac.h>
-#include <bindle_prefix.h>
+#ifdef HAVE_BINDLE_PREFIX_H
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
 
 
 ///////////////////
diff --git a/src/ttu/widget-config.c b/src/ttu/widget-config.c
index e3e962e..f6a8181 100644
--- a/src/ttu/widget-config.c
+++ b/src/ttu/widget-config.c
@@ -42,7 +42,11 @@
 #include <assert.h>
 
 #include <tinytac.h>
-#include <bindle_prefix.h>
+#ifdef HAVE_BINDLE_PREFIX_H
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
 
 
 /////////////////
-- 
cgit v1.2.3