git: fb8d0baa3acd - stable/12 - Use asprintf instead of sbuf
Baptiste Daroussin
bapt at FreeBSD.org
Wed May 5 08:25:27 UTC 2021
The branch stable/12 has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=fb8d0baa3acd6d0e639dcabaa2039cd0100b5dbb
commit fb8d0baa3acd6d0e639dcabaa2039cd0100b5dbb
Author: Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2020-10-19 07:26:42 +0000
Commit: Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-05-05 08:11:10 +0000
Use asprintf instead of sbuf
---
usr.sbin/pkg/config.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index 80469bf2b5a5..69bdece6c1a9 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/queue.h>
-#include <sys/sbuf.h>
#include <sys/utsname.h>
+#include <sys/sbuf.h>
#include <sys/sysctl.h>
#include <dirent.h>
@@ -178,7 +178,7 @@ pkg_get_myabi(char *dest, size_t sz)
static void
subst_packagesite(const char *abi)
{
- struct sbuf *newval;
+ char *newval;
const char *variable_string;
const char *oldval;
@@ -190,14 +190,14 @@ subst_packagesite(const char *abi)
if ((variable_string = strstr(oldval, "${ABI}")) == NULL)
return;
- newval = sbuf_new_auto();
- sbuf_bcat(newval, oldval, variable_string - oldval);
- sbuf_cat(newval, abi);
- sbuf_cat(newval, variable_string + strlen("${ABI}"));
- sbuf_finish(newval);
+ asprintf(&newval, "%.*s%s%s",
+ (int)(variable_string - oldval), oldval, abi,
+ variable_string + strlen("${ABI}"));
+ if (newval == NULL)
+ errx(EXIT_FAILURE, "asprintf");
free(c[PACKAGESITE].value);
- c[PACKAGESITE].value = strdup(sbuf_data(newval));
+ c[PACKAGESITE].value = newval;
}
static int
More information about the dev-commits-src-all
mailing list