folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify / sanitize expandU() a bit 

- Instead of saving and restoring the bits we'll mess with, just
  make a temporary expansion state struct with non-buffer state
  copied from "parent".
This commit is contained in:
Panu Matilainen 2010-09-27 14:22:56 +03:00
parent 49f99b8656
commit d8777387db
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpmio/macro.c
View File

@ -444,23 +444,18 @@ expandT(MacroBuf mb, const char * f, size_t flen)
static int
expandU(MacroBuf mb, char * u, size_t ulen)
{
size_t tpos = mb->tpos;
size_t nb = mb->nb;
char *tbuf = mb->buf;
struct MacroBuf_s umb;
int rc;
/* Force new expansion buffer */
mb->buf = NULL;
rc = expandMacro(mb, u);
/* Copy other state from "parent", but we want a buffer of our own */
umb = *mb;
umb.buf = NULL;
rc = expandMacro(&umb, u);
/* Copy back result, flag error on truncation */
rc += (rstrlcpy(u, mb->buf, ulen) >= ulen);
rc += (rstrlcpy(u, umb.buf, ulen) >= ulen);
_free(mb->buf);
mb->buf = tbuf;
mb->tpos = tpos;
mb->nb = nb;
_free(umb.buf);
return rc;
}