emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bin/xbps-checkvers: replace strncat with one snprintf

Browse Source
This commit is contained in:
Duncaen 2019-03-22 16:07:43 +01:00
parent 31737ff946
commit f20032efa3
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/xbps-checkvers/main.c
View File

@ -566,8 +566,8 @@ rcv_check_version(rcv_t *rcv)
{ {
map_item_t pkgname, version, revision, reverts; map_item_t pkgname, version, revision, reverts;
const char *repover = NULL; const char *repover = NULL;
char _srcver[BUFSIZ] = { '\0' }; char srcver[BUFSIZ] = { '\0' };
char *srcver = _srcver; int sz;
assert(rcv); assert(rcv);
@ -593,16 +593,23 @@ rcv_check_version(rcv_t *rcv)
assert(version.v.s); assert(version.v.s);
assert(revision.v.s); assert(revision.v.s);
srcver = strncpy(srcver, pkgname.v.s, pkgname.v.len); sz = snprintf(srcver, sizeof srcver, "%.*s-%.*s_%.*s",
(int)pkgname.v.len, pkgname.v.s,
(int)version.v.len, version.v.s,
(int)revision.v.len, revision.v.s);
if (sz < 0 || (size_t)sz >= sizeof srcver)
exit(EXIT_FAILURE);
/* temporarily use pkgname only */
srcver[pkgname.v.len] = '\0';
if (rcv->installed) if (rcv->installed)
rcv->pkgd = xbps_pkgdb_get_pkg(&rcv->xhp, srcver); rcv->pkgd = xbps_pkgdb_get_pkg(&rcv->xhp, srcver);
else else
rcv->pkgd = xbps_rpool_get_pkg(&rcv->xhp, srcver); rcv->pkgd = xbps_rpool_get_pkg(&rcv->xhp, srcver);
srcver = strncat(srcver, "-", 1); /* back to pkgver */
srcver = strncat(srcver, version.v.s, version.v.len); srcver[pkgname.v.len] = '-';
srcver = strncat(srcver, "_", 1);
srcver = strncat(srcver, revision.v.s, revision.v.len);
xbps_dictionary_get_cstring_nocopy(rcv->pkgd, "pkgver", &repover); xbps_dictionary_get_cstring_nocopy(rcv->pkgd, "pkgver", &repover);