#include "system.h"
+#include <errno.h>
#include <netinet/in.h>
#include <rpm/rpmlib.h> /* rpmGetOs/ArchInfo() */
#include <rpm/rpmlog.h>
+#include <rpm/rpmstring.h>
#include "lib/signature.h"
+#include "lib/header_internal.h" /* Freadall() */
#include "lib/rpmlead.h"
-#include "lib/legacy.h"
#include "debug.h"
char reserved[16]; /*!< Pad to 96 bytes -- 8 byte aligned! */
};
-rpmlead rpmLeadNew(void)
+rpmlead rpmLeadFromHeader(Header h)
{
- int archnum, osnum;
- rpmlead l = calloc(1, sizeof(*l));
+ rpmlead l = NULL;
- rpmGetArchInfo(NULL, &archnum);
- rpmGetOsInfo(NULL, &osnum);
+ if (h != NULL) {
+ int archnum, osnum;
+ char * nevr = headerGetAsString(h, RPMTAG_NEVR);
- l->major = (_noDirTokens ? 4: 3);
- l->minor = 0;
- l->archnum = archnum;
- l->osnum = osnum;
- l->signature_type = RPMSIGTYPE_HEADERSIG;
- return l;
-}
+ /* FIXME: should grab these from header instead (RhBug:717898) */
+ rpmGetArchInfo(NULL, &archnum);
+ rpmGetOsInfo(NULL, &osnum);
-rpmlead rpmLeadFromHeader(Header h)
-{
- char * nevr;
- assert(h != NULL);
- rpmlead l = rpmLeadNew();
+ l = xcalloc(1, sizeof(*l));
+ l->major = 3;
+ l->minor = 0;
+ l->archnum = archnum;
+ l->osnum = osnum;
+ l->signature_type = RPMSIGTYPE_HEADERSIG;
+ l->type = (headerIsSource(h) ? 1 : 0);
- l->type = (headerIsSource(h) ? 1 : 0);
- nevr = headerGetNEVR(h, NULL);
- rstrlcpy(l->name, nevr, sizeof(l->name));
- free(nevr);
+ memcpy(l->magic, lead_magic, sizeof(l->magic));
+ rstrlcpy(l->name, nevr, sizeof(l->name));
+
+ free(nevr);
+ }
return l;
}
rpmlead rpmLeadFree(rpmlead lead)
{
- assert(lead != NULL);
free(lead);
return NULL;
}
/* The lead needs to be 8 byte aligned */
rpmRC rpmLeadWrite(FD_t fd, rpmlead lead)
{
- struct rpmlead_s l;
- assert(lead != NULL);
-
- memcpy(&l, lead, sizeof(l));
-
- memcpy(&l.magic, lead_magic, sizeof(l.magic));
- l.type = htons(lead->type);
- l.archnum = htons(lead->archnum);
- l.osnum = htons(lead->osnum);
- l.signature_type = htons(lead->signature_type);
-
- if (Fwrite(&l, 1, sizeof(l), fd) != sizeof(l))
- return RPMRC_FAIL;
+ rpmRC rc = RPMRC_FAIL;
- return RPMRC_OK;
+ if (lead != NULL) {
+ struct rpmlead_s l;
+ memcpy(&l, lead, sizeof(l));
+
+ l.type = htons(lead->type);
+ l.archnum = htons(lead->archnum);
+ l.osnum = htons(lead->osnum);
+ l.signature_type = htons(lead->signature_type);
+
+ if (Fwrite(&l, 1, sizeof(l), fd) == sizeof(l))
+ rc = RPMRC_OK;
+ }
+ return rc;
}
-rpmRC rpmLeadCheck(rpmlead lead, const char **msg)
+static rpmRC rpmLeadCheck(rpmlead lead, char **msg)
{
if (memcmp(lead->magic, lead_magic, sizeof(lead_magic))) {
- if (msg) *msg = _("not an rpm package");
+ *msg = xstrdup(_("not an rpm package"));
return RPMRC_NOTFOUND;
}
if (lead->signature_type != RPMSIGTYPE_HEADERSIG) {
- if (msg) *msg = _("illegal signature type");
+ *msg = xstrdup(_("illegal signature type"));
return RPMRC_FAIL;
}
if (lead->major < 3 || lead->major > 4) {
- if (msg) *msg = _("unsupported RPM package version");
+ *msg = xstrdup(_("unsupported RPM package version"));
return RPMRC_FAIL;
}
return RPMRC_OK;
}
-rpmRC rpmLeadRead(FD_t fd, rpmlead lead)
+rpmRC rpmLeadRead(FD_t fd, rpmlead *lead, int *type, char **emsg)
{
- assert(lead != NULL);
- memset(lead, 0, sizeof(*lead));
- /* FIX: remove timed read */
- if (timedRead(fd, (char *)lead, sizeof(*lead)) != sizeof(*lead)) {
+ rpmRC rc = RPMRC_OK;
+ struct rpmlead_s l;
+ char *err = NULL;
+
+ memset(&l, 0, sizeof(l));
+ if (Freadall(fd, &l, sizeof(l)) != sizeof(l)) {
if (Ferror(fd)) {
- rpmlog(RPMLOG_ERR, _("read failed: %s (%d)\n"),
- Fstrerror(fd), errno);
- return RPMRC_FAIL;
+ rasprintf(&err, _("read failed: %s (%d)\n"), Fstrerror(fd), errno);
+ rc = RPMRC_FAIL;
+ } else {
+ err = xstrdup(_("not an rpm package\n"));
+ rc = RPMRC_NOTFOUND;
}
- return RPMRC_NOTFOUND;
+ } else {
+ l.type = ntohs(l.type);
+ l.archnum = ntohs(l.archnum);
+ l.osnum = ntohs(l.osnum);
+ l.signature_type = ntohs(l.signature_type);
+ rc = rpmLeadCheck(&l, &err);
}
- lead->type = ntohs(lead->type);
- lead->archnum = ntohs(lead->archnum);
- lead->osnum = ntohs(lead->osnum);
- lead->signature_type = ntohs(lead->signature_type);
- return RPMRC_OK;
+ if (rc == RPMRC_OK) {
+ if (lead != NULL) {
+ *lead = xmalloc(sizeof(l));
+ memcpy(*lead, &l, sizeof(l));
+ }
+ if (type != NULL)
+ *type = l.type;
+ } else {
+ if (emsg != NULL)
+ *emsg = err;
+ else
+ free(err);
+ }
+
+ return rc;
}