From 93412148b703de0726144ed6063af49e1e081658 Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Mon, 13 Jun 2022 14:41:24 -0800 Subject: libtinytac: replacing tinytacb_XXX() with bindle_XXX() --- lib/libtinytac/lconf.c | 44 ++++++++++++++++++++++---------------------- lib/libtinytac/lerror.c | 2 +- lib/libtinytac/libtinytac.h | 6 +++++- lib/libtinytac/lmemory.c | 30 +++++++++++++++--------------- 4 files changed, 43 insertions(+), 39 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)); diff --git a/lib/libtinytac/lerror.c b/lib/libtinytac/lerror.c index 20c2ffe..e820b1d 100644 --- a/lib/libtinytac/lerror.c +++ b/lib/libtinytac/lerror.c @@ -114,7 +114,7 @@ tinytac_strerror_r( assert(strerrbuf != NULL); assert(buflen > 1); msg = tinytac_error_map(errnum); - tinytacb_strlcpy(strerrbuf, msg, buflen); + bindle_strlcpy(strerrbuf, msg, buflen); return(strerrbuf); } diff --git a/lib/libtinytac/libtinytac.h b/lib/libtinytac/libtinytac.h index 1aaaa52..bfa5d47 100644 --- a/lib/libtinytac/libtinytac.h +++ b/lib/libtinytac/libtinytac.h @@ -53,7 +53,11 @@ #include #include -#include +#ifdef HAVE_BINDLE_PREFIX_H +# include +#else +# include +#endif ////////////// diff --git a/lib/libtinytac/lmemory.c b/lib/libtinytac/lmemory.c index 1e186ab..fce6f5c 100644 --- a/lib/libtinytac/lmemory.c +++ b/lib/libtinytac/lmemory.c @@ -241,7 +241,7 @@ tinytac_get_option( case TTAC_OPT_DEBUG_IDENT: TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( tt, TTAC_OPT_DEBUG_IDENT, outvalue )", __func__); TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tinytac_debug_ident); - if ((*((char **)outvalue) = tinytacb_strdup(tinytac_debug_ident)) == NULL) + if ((*((char **)outvalue) = bindle_strdup(tinytac_debug_ident)) == NULL) return(TTAC_ENOMEM); return(TTAC_SUCCESS); @@ -261,7 +261,7 @@ tinytac_get_option( str = ((tt)) ? tt->hosts : tinytac_dflt_hosts; TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_HOSTS, outvalue )", __func__, (((tt)) ? "tt" : "NULL")); TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", str); - if ((*((char **)outvalue) = tinytacb_strdup(str)) == NULL) + if ((*((char **)outvalue) = bindle_strdup(str)) == NULL) return(TTAC_ENOMEM); return(TTAC_SUCCESS); @@ -286,7 +286,7 @@ tinytac_get_option( if (!(tt->keys[0])) return(TTAC_SUCCESS); TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tt->keys[0]); - if ((*((char **)outvalue) = tinytacb_strdup(tt->keys[0])) == NULL) + if ((*((char **)outvalue) = bindle_strdup(tt->keys[0])) == NULL) return(TTAC_ENOMEM); return(TTAC_SUCCESS); @@ -298,7 +298,7 @@ tinytac_get_option( return(TTAC_SUCCESS); for(pos = 0; ((tt->keys[pos])); pos++) TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tt->keys[pos]); - if ((tinytacb_strsdup((char ***)outvalue, tt->keys))) + if ((bindle_strsdup((char ***)outvalue, tt->keys))) return(TTAC_ENOMEM); return(TTAC_SUCCESS); @@ -460,7 +460,7 @@ tinytac_set_option( case TTAC_OPT_DEBUG_IDENT: TinyTacDebug( TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_DEBUG_IDENT, invalue )", __func__, (((tt)) ? "tt" : "NULL") ); istr = (((const char *)invalue)) ? ((const char *)invalue) : TTAC_DFLT_DEBUG_IDENT; - tinytacb_strlcpy(tinytac_debug_ident_buff, istr, sizeof(tinytac_debug_ident_buff)); + bindle_strlcpy(tinytac_debug_ident_buff, istr, sizeof(tinytac_debug_ident_buff)); tinytac_debug_ident = tinytac_debug_ident_buff; return(TTAC_SUCCESS); @@ -601,7 +601,7 @@ tinytac_set_option_host( budps = NULL; budps_len = 0; - if ((buff = tinytacb_strdup(invalue)) == NULL) + if ((buff = bindle_strdup(invalue)) == NULL) return(TTAC_ENOMEM); str = buff; @@ -632,7 +632,7 @@ tinytac_set_option_host( budps[budps_len+1] = NULL; // parse URL - if ((rc = tinytacb_urldesc_parse(str, &budps[budps_len])) != 0) + if ((rc = bindle_urldesc_parse(str, &budps[budps_len])) != 0) { free(buff); tinytac_tinytac_free_budps(budps); @@ -655,7 +655,7 @@ tinytac_set_option_host( }; // resolve URL host - if ((rc = tinytacb_urldesc_resolve(budps[budps_len], AF_UNSPEC, TTAC_DFLT_PORT)) != 0) + if ((rc = bindle_urldesc_resolve(budps[budps_len], AF_UNSPEC, TTAC_DFLT_PORT)) != 0) { free(buff); tinytac_tinytac_free_budps(budps); @@ -669,7 +669,7 @@ tinytac_set_option_host( free(buff); // saves host string - if ((ostr = tinytacb_strdup(invalue)) == NULL) + if ((ostr = bindle_strdup(invalue)) == NULL) { tinytac_tinytac_free_budps(budps); return(TTAC_ENOMEM); @@ -710,22 +710,22 @@ tinytac_set_option_keys( if ((invalue)) { - if (tinytacb_strsadd(&strs, invalue) != 0) + if (bindle_strsadd(&strs, invalue) != 0) return(TTAC_ENOMEM); } else if ((invalues)) { - if (tinytacb_strsdup(&strs, invalues) != 0) + if (bindle_strsdup(&strs, invalues) != 0) return(TTAC_ENOMEM); } else if ((tt)) { if ((tinytac_dflt.keys)) - if (tinytacb_strsdup(&strs, tinytac_dflt.keys) != 0) + if (bindle_strsdup(&strs, tinytac_dflt.keys) != 0) return(TTAC_ENOMEM); }; - tinytacb_strsfree(*strsp); + bindle_strsfree(*strsp); *strsp = strs; return(TTAC_SUCCESS); @@ -743,7 +743,7 @@ tinytac_tinytac_free( if ((tt->hosts)) free(tt->hosts); if ((tt->keys)) - tinytacb_strsfree(tt->keys); + bindle_strsfree(tt->keys); tinytac_tinytac_free_budps(tt->budps); @@ -762,7 +762,7 @@ tinytac_tinytac_free_budps( if (!(budps)) return; for(pos = 0; ((budps[pos])); pos++) - tinytacb_urldesc_free(budps[pos]); + bindle_urldesc_free(budps[pos]); free(budps); return; } -- cgit v1.2.3