From 49ae796d731ae3a8fb9ca172d3502f87a157f4ba Mon Sep 17 00:00:00 2001 From: ewt Date: Wed, 27 Dec 1995 19:45:36 +0000 Subject: [PATCH] changed to use rpmlead.h CVS patchset: 102 CVS date: 1995/12/27 19:45:36 --- build/pack.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build/pack.c b/build/pack.c index 23959ed..c334df4 100644 --- a/build/pack.c +++ b/build/pack.c @@ -16,8 +16,9 @@ #include "header.h" #include "specP.h" -#include "rpmlib.h" #include "rpmerr.h" +#include "rpmlead.h" +#include "rpmlib.h" #include "misc.h" #include "pack.h" #include "messages.h" @@ -27,8 +28,6 @@ #define BINARY_HEADER 0 #define SOURCE_HEADER 1 -static unsigned char magic[] = { 0xed, 0xab, 0xee, 0xdb }; - struct file_entry { char file[1024]; int isdoc; @@ -48,20 +47,21 @@ static int add_file_aux(char *file, struct stat *sb, int flag); static int writeMagic(Spec s, struct PackageRec *pr, int fd, char *name, unsigned char type) { - char header[74]; - - header[0] = 2; /* major */ - header[1] = 0; /* minor */ - header[2] = 0; - header[3] = type; - header[4] = 0; - header[5] = getArchNum(); - strncpy(&(header[6]), name, 66); - header[72] = 0; - header[73] = getOsNum(); - - write(fd, &magic, 4); - write(fd, &header, 74); + struct rpmlead lead; + + lead.magic[0] = RPMLEAD_MAGIC0; + lead.magic[1] = RPMLEAD_MAGIC1; + lead.magic[2] = RPMLEAD_MAGIC2; + lead.magic[3] = RPMLEAD_MAGIC3; + + lead.major = 2; + lead.minor = 0; + lead.type = htons(RPMLEAD_BINARY); + lead.archnum = htons(getArchNum()); + lead.osnum = htons(getOsNum()); + strncpy(lead.name, name, sizeof(lead.name)); + + write(fd, &lead, sizeof(lead)); return 0; } -- 2.7.4