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

Simplify package comparison and format creation. 

- also avoid static buffer usage
This commit is contained in:
Jindrich Novy 2008-04-04 13:01:50 +02:00
parent baf9e88fc3
commit f6b0cf178a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/spec.c
View File

@ -580,36 +580,33 @@ printNewSpecfile(rpmSpec spec)
spectag t = st->st_t + i;
const char * tn = rpmTagGetName(t->t_tag);
const char * errstr;
char fmt[1024];
char *fmt;
fmt[0] = '\0';
if (t->t_msgid == NULL)
h = spec->packages->header;
else {
Package pkg;
char *fe;
char *buf = xstrdup(t->t_msgid);
strcpy(fmt, t->t_msgid);
for (fe = fmt; *fe && *fe != '('; fe++)
{} ;
if (*fe == '(') *fe = '\0';
fe = strchr(buf, '(');
h = NULL;
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
const char *pkgname;
h = pkg->header;
(void) headerNVR(h, &pkgname, NULL, NULL);
if (!strcmp(pkgname, fmt))
if (!strcmp(pkgname, buf))
break;
}
if (pkg == NULL || h == NULL)
h = spec->packages->header;
free(buf);
}
if (h == NULL)
continue;
fmt[0] = '\0';
(void) stpcpy( stpcpy( stpcpy( fmt, "%{"), tn), "}");
rasprintf(&fmt, "%{%s}", tn);
msgstr = _free(msgstr);
/* XXX this should use queryHeader(), but prints out tn as well. */
@ -618,6 +615,7 @@ printNewSpecfile(rpmSpec spec)
rpmlog(RPMLOG_ERR, _("can't query %s: %s\n"), tn, errstr);
return;
}
free(fmt);
switch(t->t_tag) {
case RPMTAG_SUMMARY: