system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use asprintf instead of sbuf

Browse source
This commit is contained in:
Baptiste Daroussin 2020-10-19 07:26:42 +00:00
parent 618cdd8964
commit ae659caa0a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=366828
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
usr.sbin/pkg/config.c
View file

@ -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>
@ -168,7 +168,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;
@ -180,14 +180,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