1 files changed, 22 insertions, 22 deletions

diff --git a/lib/libtinytac/lconf.c b/lib/libtinytac/lconf.c
index 0957127..b41590c 100644
--- a/lib/libtinytac/lconf.c
+++ b/lib/libtinytac/lconf.c
@@ -218,19 +218,19 @@ tinytac_conf(
    tinytac_conf_file(SYSCONFDIR "/tinytac.conf");
 
    // process "~/tinytacrc"
-   tinytacb_strlcpy(path, home,           sizeof(path));
-   tinytacb_strlcat(path, "/tinytacrc",   sizeof(path));
+   bindle_strlcpy(path, home,           sizeof(path));
+   bindle_strlcat(path, "/tinytacrc",   sizeof(path));
    if (tinytac_conf_file(path) == TTAC_ESTOPINIT)
       return(TTAC_SUCCESS);
 
    // process "~/.tinytacrc"
-   tinytacb_strlcpy(path, home,           sizeof(path));
-   tinytacb_strlcat(path, "/.tinytacrc",  sizeof(path));
+   bindle_strlcpy(path, home,           sizeof(path));
+   bindle_strlcat(path, "/.tinytacrc",  sizeof(path));
    if (tinytac_conf_file(path) == TTAC_ESTOPINIT)
       return(TTAC_SUCCESS);
 
    // process "./tinytacrc"
-   tinytacb_strlcpy(path, "./tinytacrc",  sizeof(path));
+   bindle_strlcpy(path, "./tinytacrc",  sizeof(path));
    if (tinytac_conf_file(path) == TTAC_ESTOPINIT)
       return(TTAC_SUCCESS);
 
@@ -243,22 +243,22 @@ tinytac_conf(
    if ((tintacrc = getenv("TINYTACRC")) != NULL)
    {
       // process "~/${TINYTACRC}"
-      tinytacb_strlcpy(path, home,        sizeof(path));
-      tinytacb_strlcat(path, "/",         sizeof(path));
-      tinytacb_strlcat(path, tintacrc,    sizeof(path));
+      bindle_strlcpy(path, home,        sizeof(path));
+      bindle_strlcat(path, "/",         sizeof(path));
+      bindle_strlcat(path, tintacrc,    sizeof(path));
       if (tinytac_conf_file(path) == TTAC_ESTOPINIT)
          return(TTAC_SUCCESS);
 
       // process "~/.{$TINYTACRC}"
-      tinytacb_strlcpy(path, home,        sizeof(path));
-      tinytacb_strlcat(path, "/.",        sizeof(path));
-      tinytacb_strlcat(path, tintacrc,    sizeof(path));
+      bindle_strlcpy(path, home,        sizeof(path));
+      bindle_strlcat(path, "/.",        sizeof(path));
+      bindle_strlcat(path, tintacrc,    sizeof(path));
       if (tinytac_conf_file(path) == TTAC_ESTOPINIT)
          return(TTAC_SUCCESS);
 
       // process "./${TINYTACRC}"
-      tinytacb_strlcpy(path, "./",        sizeof(path));
-      tinytacb_strlcat(path, tintacrc,    sizeof(path));
+      bindle_strlcpy(path, "./",        sizeof(path));
+      bindle_strlcat(path, tintacrc,    sizeof(path));
       if (tinytac_conf_file(path) == TTAC_ESTOPINIT)
          return(TTAC_SUCCESS);
    };
@@ -287,8 +287,8 @@ tinytac_conf_environment(
       opt = &tinytac_conf_options[pos];
       if (opt->opt_id == TTAC_OPT_STOPINIT)
          continue;
-      tinytacb_strlcpy(varname, "TINYTAC_", sizeof(varname));
-      tinytacb_strlcat(varname, opt->opt_name, sizeof(varname));
+      bindle_strlcpy(varname, "TINYTAC_", sizeof(varname));
+      bindle_strlcat(varname, opt->opt_name, sizeof(varname));
       if ((value = getenv(varname)) != NULL)
          tinytac_conf_opt(opt, value);
    };
@@ -326,36 +326,36 @@ tinytac_conf_file(
 
    while( ((len)) && (rc == TTAC_SUCCESS) )
    {
-      if ((len = tinytacb_readline(fd, buff, sizeof(buff))) == -1)
+      if ((len = bindle_readline(fd, buff, sizeof(buff))) == -1)
       {
          close(fd);
          return(TTAC_EUNKNOWN);
       };
       if (!(len))
          continue;
-      if (tinytacb_strtoargs(buff, &argv, &argc) != TTAC_SUCCESS)
+      if (bindle_strtoargs(buff, &argv, &argc) != TTAC_SUCCESS)
       {
          close(fd);
          return(TTAC_ESYNTAX);
       };
       if ( (argc < 1) || (argc > 2) )
       {
-         tinytacb_strsfree(argv);
+         bindle_strsfree(argv);
          continue;
       };
       if ((opt = tinytac_opt_lookup_name(argv[0])) == NULL)
       {
-         tinytacb_strsfree(argv);
+         bindle_strsfree(argv);
          continue;
       };
-      val = tinytacb_strexpand(value, argv[1], sizeof(value), TTAC_NO);
+      val = bindle_strexpand(value, argv[1], sizeof(value), TTAC_NO);
       switch(tinytac_conf_opt(opt, val))
       {
          case TTAC_ESTOPINIT: rc = TTAC_ESTOPINIT; break;
          case TTAC_ENOMEM:    rc = TTAC_ENOMEM;    break;
          default:                                  break;
       };
-      tinytacb_strsfree(argv);
+      bindle_strsfree(argv);
    };
 
    close(fd);
@@ -461,7 +461,7 @@ tinytac_conf_opt_flag(
 
    TinyTacDebugTrace();
 
-   switch(i = ((value)) ? tinytacb_strtobool(value) : TTAC_YES)
+   switch(i = ((value)) ? bindle_strtobool(value) : TTAC_YES)
    {
       case TTAC_NO:  return(tinytac_set_option(NULL, (int)opt->opt_id, &i));
       case TTAC_YES: return(tinytac_set_option(NULL, (int)opt->opt_id, &i));