X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Frpmlead.c;h=8e56bfc386d55cd8db4bb742f144adc4cf134fda;hb=9cf156d6583a9f9581000bb12ff047980ebcef03;hp=0cadecde26fa351fd46a9bb84f02d41502ffdb4b;hpb=e4151252f8c4e422e18f83616392e3dc53d6d1ab;p=platform%2Fupstream%2Frpm.git

diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 0cadecd..8e56bfc 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -1,57 +1,152 @@
-#include "system.h"
-#include "miscfn.h"
+/** \ingroup lead
+ * \file lib/rpmlead.c
+ */
 
-#if HAVE_MACHINE_TYPES_H
-# include <machine/types.h>
-#endif
+#include "system.h"
 
+#include <errno.h>
 #include <netinet/in.h>
 
-#include "rpmlib.h"
-#include "rpmlead.h"
-#include "tread.h"
-#include "intl.h"
+#include <rpm/rpmlib.h>		/* rpmGetOs/ArchInfo() */
+#include <rpm/rpmlog.h>
+#include <rpm/rpmstring.h>
 
-/* The lead needs to be 8 byte aligned */
+#include "lib/signature.h"
+#include "lib/header_internal.h"	/* Freadall() */
+#include "lib/rpmlead.h"
+
+#include "debug.h"
 
-int writeLead(int fd, struct rpmlead *lead)
+static unsigned char const lead_magic[] = {
+    RPMLEAD_MAGIC0, RPMLEAD_MAGIC1, RPMLEAD_MAGIC2, RPMLEAD_MAGIC3
+};
+
+/** \ingroup lead
+ * The lead data structure.
+ * The lead needs to be 8 byte aligned.
+ * @deprecated The lead (except for signature_type) is legacy.
+ * @todo Don't use any information from lead.
+ */
+struct rpmlead_s {
+    unsigned char magic[4];
+    unsigned char major;
+    unsigned char minor;
+    short type;
+    short archnum;
+    char name[66];
+    short osnum;
+    short signature_type;       /*!< Signature header type (RPMSIG_HEADERSIG) */
+    char reserved[16];      /*!< Pad to 96 bytes -- 8 byte aligned! */
+};
+
+rpmlead rpmLeadFromHeader(Header h)
 {
-    struct rpmlead l;
-
-    memcpy(&l, lead, sizeof(*lead));
-    
-    l.magic[0] = RPMLEAD_MAGIC0;
-    l.magic[1] = RPMLEAD_MAGIC1;
-    l.magic[2] = RPMLEAD_MAGIC2;
-    l.magic[3] = RPMLEAD_MAGIC3;
-
-    l.type = htons(l.type);
-    l.archnum = htons(l.archnum);
-    l.osnum = htons(l.osnum);
-    l.signature_type = htons(l.signature_type);
-	
-    if (write(fd, &l, sizeof(l)) < 0) {
-	return 1;
+    rpmlead l = NULL;
+
+    if (h != NULL) {
+	int archnum, osnum;
+	char * nevr = headerGetAsString(h, RPMTAG_NEVR);
+
+	/* FIXME: should grab these from header instead (RhBug:717898) */
+	rpmGetArchInfo(NULL, &archnum);
+	rpmGetOsInfo(NULL, &osnum);
+
+	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);
+
+	memcpy(l->magic, lead_magic, sizeof(l->magic));
+	rstrlcpy(l->name, nevr, sizeof(l->name));
+
+	free(nevr);
     }
 
-    return 0;
+    return l;
 }
 
-int readLead(int fd, struct rpmlead *lead)
+rpmlead rpmLeadFree(rpmlead lead)
 {
-    if (timedRead(fd, lead, sizeof(*lead)) != sizeof(*lead)) {
-	rpmError(RPMERR_READERROR, _("read failed: %s (%d)"), strerror(errno), 
-	      errno);
-	return 1;
-    }
+    free(lead);
+    return NULL;
+}
 
-    lead->type = ntohs(lead->type);
-    lead->archnum = ntohs(lead->archnum);
-    lead->osnum = ntohs(lead->osnum);
+/* The lead needs to be 8 byte aligned */
+rpmRC rpmLeadWrite(FD_t fd, rpmlead lead)
+{
+    rpmRC rc = RPMRC_FAIL;
 
-    if (lead->major >= 2)
-	lead->signature_type = ntohs(lead->signature_type);
+    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;
+}
 
-    return 0;
+static rpmRC rpmLeadCheck(rpmlead lead, char **msg)
+{
+    if (memcmp(lead->magic, lead_magic, sizeof(lead_magic))) {
+	*msg = xstrdup(_("not an rpm package"));
+	return RPMRC_NOTFOUND;
+    }
+    if (lead->signature_type != RPMSIGTYPE_HEADERSIG) {
+	*msg = xstrdup(_("illegal signature type"));
+	return RPMRC_FAIL;
+    }
+    if (lead->major < 3 || lead->major > 4) {
+	*msg = xstrdup(_("unsupported RPM package version"));
+	return RPMRC_FAIL;
+    }
+    return RPMRC_OK;
 }
 
+rpmRC rpmLeadRead(FD_t fd, rpmlead *lead, int *type, char **emsg)
+{
+    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)) {
+	    rasprintf(&err, _("read failed: %s (%d)\n"), Fstrerror(fd), errno);
+	    rc = RPMRC_FAIL;
+	} else {
+	    err = xstrdup(_("not an rpm package\n"));
+	    rc = 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);
+    }
+
+    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;
+}