 @@ -1,17 +1,17 @@
-/*	$NetBSD: rpm2pkg.c,v 1.19 2010/12/22 09:36:35 tron Exp $	*/
+/*	$NetBSD: rpm2pkg.c,v 1.20 2011/01/12 00:26:33 tron Exp $	*/
 /*-
- * Copyright (c) 2001-2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,97 +21,58 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <bzlib.h>
+#include "fileio.h"
-#include <zlib.h>
+#include "package-list.h"
 #include "parse-rpm.h"
 /*
  * The following definitions are based on the documentation of the
  * RPM format which can be found here:
  * http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html
  */
 /* Lead of an RPM archive. */
 typedef struct RPMLead_s {
     uint8_t	magic[4];
     uint8_t	major, minor;
     int16_t	type;
     int16_t	archnum;
     int8_t	name[66];
     int16_t	osnum;
     uint16_t	signature_type;
     int8_t	reserved[16];
 } RPMLead;
 static const uint8_t RPMLeadMagic[] = { 0xed, 0xab, 0xee, 0xdb };
 /* Header section of an RPM archive. */
 typedef struct RPMHeader_s {
   uint8_t	magic[3];
   uint8_t	version;
   uint8_t	reserved[4];
   uint32_t	indexSize;
   uint32_t	dataSize;
 } RPMHeader;
 static const uint8_t RPMHeaderMagic[] = { 0x8e, 0xad, 0xe8 };
 /* Magic bytes for "bzip2" and "gzip" compressed files. */
 static const unsigned char BZipMagic[] = { 'B', 'Z', 'h' };
 static const unsigned char GZipMagic[] = { 0x1f, 0x8b, 0x08 };
 /* Structure of a cpio(1) archive. */
 #define C_IRUSR			0000400
 #define C_IWUSR			0000200
 #define C_IXUSR			0000100
 #define C_IRGRP			0000040
 #define C_IWGRP			0000020
 #define C_IXGRP			0000010
 #define C_IROTH			0000004
 #define C_IWOTH			0000002
 #define C_IXOTH			0000001
 #define C_ISUID			0004000
 #define C_ISGID			0002000
 #define C_ISVTX			0001000
 #define C_ISDIR			0040000
 #define C_ISREG			0100000
 #define C_ISCHR			0020000
 #define C_ISLNK			0120000
 static const unsigned char CPIOMagic[] = {'0','7','0','7','0','1'};
 #define CPIO_END_MARKER		"TRAILER!!!"
 #define CPIO_FIELD_LENGTH	8
 #define CPIO_HDR_INODE		0
 #define CPIO_HDR_MODE		1
 #define CPIO_HDR_FILESIZE	6
 #define CPIO_HDR_NAMESIZE	11
 #define CPIO_NUM_HEADERS	13
 #define CP_IFMT			0170000
 @@ -126,974 +87,618 @@ ModeMap ModeMapTab[] = {
 	{C_IXUSR, S_IXUSR},
 	{C_IRGRP, S_IRGRP},
 	{C_IWGRP, S_IWGRP},
 	{C_IXGRP, S_IXGRP},
 	{C_IROTH, S_IROTH},
 	{C_IWOTH, S_IWOTH},
 	{C_IXOTH, S_IXOTH},
 	{C_ISUID, S_ISUID},
 	{C_ISGID, S_ISGID},
 	{C_ISVTX, S_ISVTX},
 	{0, 0}
 };
 typedef struct PListEntryStruct PListEntry;
 struct PListEntryStruct {
 	PListEntry	*pe_Childs[2];
 	int		pe_DirEmpty;
 	unsigned long	pe_INode;
 	char		*pe_Link;
 	char		pe_Name[1];
 };
 #define	pe_Left		pe_Childs[0]
 #define	pe_Right	pe_Childs[1]
 typedef void PListEntryFunc(PListEntry *,FILE *);
 typedef struct FileHandleStruct {
 	FILE	*fh_File;
 	BZFILE	*fh_BZFile;
 	gzFile	*fh_GZFile;
 	off_t	fh_Pos;
 	int	fh_FD;
 	pid_t	fh_Child;
 } FileHandle;
 static bool
 InitBuffer(void **Buffer, size_t *BufferSizePtr)
 	if (*Buffer == NULL) {
 		size_t BufferSize;
 		BufferSize = sysconf(_SC_PAGESIZE) * 256;
 		while ((*Buffer = malloc(BufferSize)) == NULL) {
 			BufferSize >>= 1;
 			if (BufferSize == 0)
 				return false;
 		*BufferSizePtr = BufferSize;
 	return true;
 static void
 Close(FileHandle *fh)
 	if (fh->fh_BZFile != NULL) {
 		int	bzerror;
 		(void)BZ2_bzReadClose(&bzerror, fh->fh_BZFile);
 		(void)fclose(fh->fh_File);
 	if (fh->fh_GZFile != NULL) {
 		(void)gzclose(fh->fh_GZFile);
 	if (fh->fh_FD >= 0) {
 		(void)close(fh->fh_FD);
 	if (fh->fh_Child != -1) {
 		if (waitpid(fh->fh_Child, NULL, WNOHANG) != fh->fh_Child) {
 			(void)kill(fh->fh_Child, SIGTERM);
 			(void)waitpid(fh->fh_Child, NULL, 0);
 	free(fh);
 /* Check whether we got an RPM file and find the data section. */
 static bool
 IsRPMFile(int fd)
 	RPMLead		rpmLead;
 	bool		padding;
 	RPMHeader	rpmHeader;
 	/* Check for RPM lead. */
 	if (read(fd, &rpmLead, sizeof(RPMLead)) != sizeof(RPMLead))
 		return false;
 	if (memcmp(rpmLead.magic, RPMLeadMagic, sizeof(RPMLeadMagic)) != 0)
 		return false;
 	/* We don't support very old RPMs. */
 	if (rpmLead.major < 3)
 		return false;
 	/*
 	 * The RPM file format has a horrible requirement for extra padding
 	 * depending on what type of signature is used.
 	 */
 	padding = htons(rpmLead.signature_type) == 5;
 	/* Skip over RPM header(s). */
 	while (read(fd, &rpmHeader, sizeof(RPMHeader)) == sizeof(RPMHeader)) {
 		uint32_t	indexSize, dataSize;
 		off_t		offset;
 		/* Did we find another header? */
 		if (memcmp(rpmHeader.magic, RPMHeaderMagic,
 		    sizeof(RPMHeaderMagic)) != 0) {
 			/* Nope, seek backwards and return. */
 			return (lseek(fd, -(off_t)sizeof(RPMHeader),
 			    SEEK_CUR) != -1);
 		/* Find out how large the header is ... */
 		indexSize = htonl(rpmHeader.indexSize);
 		dataSize = htonl(rpmHeader.dataSize);
 		/* .. and skip over it. */
 		offset = indexSize * 4 * sizeof(uint32_t) + dataSize;
 		if (padding) {
 			offset = ((offset + 7) / 8) * 8;
 			padding = false;
 		if (lseek(fd, offset, SEEK_CUR) == -1)
 			return false;
 	return false;
 static FileHandle *
 Open(int fd)
 	unsigned char	buffer[8];
 	FileHandle	*fh;
 	/*
 	 * Read enough bytes to identify the compression and seek back to
 	 * the beginning of the data section.
 	 */
 	if (read(fd, buffer, sizeof(buffer)) != sizeof(buffer) ||
 	    lseek(fd, -(off_t)sizeof(buffer), SEEK_CUR) == -1) {
 		return NULL;
 	if ((fh = calloc(1, sizeof (FileHandle))) == NULL)
 		return NULL;
 	fh->fh_FD = -1;
 	fh->fh_Child = -1;
 	/* Determine the compression method. */
 	if (memcmp(buffer, CPIOMagic, sizeof(CPIOMagic)) == 0) {
 		/* uncompressed data */
 		if ((fh->fh_FD = dup(fd)) < 0) {
 			free(fh);
 			return NULL;
 	} else if (memcmp(buffer, BZipMagic, sizeof(BZipMagic)) == 0) {
 		/* bzip2 archive */
 		int bzerror;
 		if ((fd = dup(fd)) < 0) {
 			free(fh);
 			return NULL;
 		if ((fh->fh_File = fdopen(fd, "rb")) == NULL) {
 			(void)close(fd);
 			free(fh);
 			return NULL;
 		if ((fh->fh_BZFile = BZ2_bzReadOpen(&bzerror, fh->fh_File, 0,
 , NULL, 0)) == NULL) {
 			(void)fclose(fh->fh_File);
 			free(fh);
 			return (NULL);
 	} else if (memcmp(buffer, GZipMagic, sizeof(GZipMagic)) == 0) {
 		/* gzip archive */
 		if ((fh->fh_GZFile = gzdopen(fd, "r")) == NULL) {
 			free(fh);
 			return (NULL);
 	} else {
 		/* lzma ... hopefully */
 #ifdef XZCAT
 		int	pfds[2];
 		char	*path, *argv[3];
 		pid_t	pid;
 		if (pipe(pfds) != 0) {
 			free(fh);
 			return (NULL);
 		path = XZCAT;
 		argv[0] = strrchr(path, '/');
 		if (argv[0] == NULL)
 			argv[0] = path;
 		argv[1] = NULL;
 		pid = vfork();
 		switch (pid) {
 		case -1:
 			(void)close(pfds[0]);
 			(void)close(pfds[1]);
 			free(fh);
 			return NULL;
 		case 0:
 			if (dup2(fd, STDIN_FILENO) == -1 ||
 			    dup2(pfds[1], STDOUT_FILENO) == -1) {
 				_exit(EXIT_FAILURE);
 			(void)close(fd);
 			(void)close(pfds[0]);
 			(void)close(pfds[1]);
 			(void)execvp(path, argv);
 			_exit(EXIT_FAILURE);
 		default:
 			(void)close(pfds[1]);
 			if (waitpid(pid, NULL, WNOHANG) == pid) {
 				(void)close(pfds[0]);
 				free(fh);
 				return NULL;
 			fh->fh_FD = pfds[0];
 			fh->fh_Child = pid;
 #else
 		free(fh);
 		fh = NULL;
 #endif
 	return (fh);
 static bool
 Read(FileHandle *fh, void *buffer, size_t length)
 	ssize_t bytes;
 	if (fh->fh_BZFile != NULL) {
 		int bzerror;
 		bytes = BZ2_bzRead(&bzerror, fh->fh_BZFile, buffer, length);
 	} else if (fh->fh_GZFile != NULL) {
 		bytes = gzread(fh->fh_GZFile, buffer, length);
 	} else if (fh->fh_FD >= 0) {
 		uint8_t	*ptr;
 		bytes = 0;
 		ptr = buffer;
 		while (bytes < (ssize_t)length) {
 			ssize_t chunk = read(fh->fh_FD, ptr, length - bytes);
 			if (chunk < 0) {
 				bytes = -1;
 				break;
 			} else if (chunk == 0) {
 				break;
 			ptr += chunk;
 			bytes += chunk;
 	} else {
 		bytes = -1;
 	if (bytes > 0)
 		fh->fh_Pos += bytes;
 	return (bytes == (ssize_t)length);
 static bool
-SkipAndAlign(FileHandle *fh, off_t Skip)
+SkipAndAlign(FileHandle *fh, off_t skip)
+{
-	off_t NewPos;
+	off_t old_pos, new_pos;
 	char buffer[1 << 16];
-	NewPos = (fh->fh_Pos + Skip + 3) & ~3;
+	old_pos = FileHandleGetPos(fh);
-	if (fh->fh_Pos == NewPos)
+	new_pos = (old_pos + skip + 3) & ~3;
 	if (old_pos == new_pos)
 		return true;
-	if (fh->fh_GZFile != NULL) {
+	while (old_pos < new_pos) {
-		if (gzseek(fh->fh_GZFile, NewPos, SEEK_SET) == NewPos) {
+		off_t length;
-			fh->fh_Pos = NewPos;
+		size_t chunk;
 			return true;
 		length = new_pos - old_pos;
-		return false;
+		chunk = (length > (off_t)sizeof(buffer)) ?
-	} else {
+		    (off_t)sizeof(buffer) : length;
-		static void	*Buffer = NULL;
+		if (!FileHandleRead(fh, buffer, chunk))
 		static size_t	BufferSize = 0;
 		if (!InitBuffer(&Buffer, &BufferSize))
 			return false;
-		while (fh->fh_Pos < NewPos) {
+		old_pos = FileHandleGetPos(fh);
 			off_t	Length;
 			int	Chunk;
 			Length = NewPos - fh->fh_Pos;
 			Chunk = (Length > (off_t)BufferSize) ?
 			    (off_t)BufferSize : Length;
 			if (!Read(fh, Buffer, Chunk))
 				return false;
+	}
 	return true;
+}
 static PListEntry *
 InsertPListEntry(PListEntry **Tree,char *Name)
 	PListEntry *Node;
 	while ((Node = *Tree) != NULL) {
 		Tree = (strcmp(Name, Node->pe_Name) <0) ?
 		    &Node->pe_Left : &Node->pe_Right;
 	if ((Node = calloc(1, sizeof (PListEntry) + strlen(Name))) == NULL) {
 		perror("calloc");
 		exit(EXIT_FAILURE);
 	(void)strcpy(Node->pe_Name, Name);
 	return *Tree = Node;
 static PListEntry *
 FindPListEntry(PListEntry *Tree, char *Name)
 	while (Tree != NULL) {
 		int Result;
 		if ((Result = strcmp(Name, Tree->pe_Name)) == 0) break;
 		Tree = (Result < 0) ? Tree->pe_Left : Tree->pe_Right;
 	return Tree;
 static void
 PListEntryFile(PListEntry *Node, FILE *Out)
 	(void)fputs(Node->pe_Name, Out);
 	(void)fputc('\n', Out);
 static char *
-StrCat(char *Prefix, char *Suffix)
+StrCat(const char *prefix, const char *suffix)
+{
-	int	Length;
+	size_t	prefix_length;
-	char	*Str;
+	char	*str;
-	Length = strlen(Prefix);
+	prefix_length = strlen(prefix);
-	if ((Str = malloc(Length + strlen(Suffix) + 1)) == NULL) {
+	if ((str = malloc(prefix_length + strlen(suffix) + 1)) == NULL) {
 	     perror("malloc");
 	     exit(EXIT_FAILURE);
+	}
-	(void)memcpy(Str, Prefix, Length);
+	(void)memcpy(str, prefix, prefix_length);
-	(void)strcpy(&Str[Length], Suffix);
+	(void)strcpy(&str[prefix_length], suffix);
-	return Str;
+	return str;
 static void
 PListEntryMakeDir(PListEntry *Node, FILE *Out)
 	if (Node->pe_DirEmpty) {
 		(void)fprintf(Out, "@pkgdir %s\n", Node->pe_Name);
 static void
 ProcessPList(PListEntry *Tree, PListEntryFunc Func, FILE *Out)
 	while (Tree != NULL) {
 		if (Tree->pe_Childs[0] != NULL)
 			ProcessPList(Tree->pe_Childs[0], Func, Out);
 		Func(Tree, Out);
 		Tree = Tree->pe_Childs[1];
+}
 static char **
-ArrayAdd(char **Array, char *String)
+ArrayAdd(char **array, char *string)
+{
-	int	Old;
+	size_t old;
-	Old = 0;
+	old = 0;
-	if (Array != NULL) {
+	if (array != NULL) {
-		while (Array[Old] != NULL)
+		while (array[old] != NULL)
-			Old ++;
+			old++;
+	}
 	if ((Array = realloc(Array, sizeof (char *) * (Old + 2))) == NULL) {
 	if ((array = realloc(array, sizeof(char *) * (old + 2))) == NULL) {
 		perror("realloc");
 		exit(EXIT_FAILURE);
+	}
-	Array[Old++] = String;
+	array[old++] = string;
-	Array[Old] = NULL;
+	array[old] = NULL;
-	return Array;
+	return array;
+}
 static void
 Usage(char *Progname)
+{
 	(void)fprintf(stderr,
 	    "Usage: %s [-d directory] [-f packlist] [[-i ignorepath] ...]\n"
 	    "               [-p prefix] [-s stripcount] rpmfile [...]\n",
 	    Progname);
 	exit(EXIT_FAILURE);
+}
 static char *
 GetData(FileHandle *In, unsigned long Length)
+{
 	char *Ptr;
 	if ((Ptr = malloc(Length + 1)) != NULL) {
-		if (Read(In, Ptr, Length) && SkipAndAlign(In, 0)) {
+		if (FileHandleRead(In, Ptr, Length) && SkipAndAlign(In, 0)) {
 			Ptr[Length] = '\0';
 			return Ptr;
+		}
 		free(Ptr);
+	}
 	return NULL;
+}
 static bool
-GetCPIOHeader(FileHandle *In, unsigned long *Fields, char **Name)
+GetCPIOHeader(FileHandle *in, unsigned long *fields, char **name)
+{
-	char	Buffer[CPIO_NUM_HEADERS * CPIO_FIELD_LENGTH], *Ptr;
+	char		buffer[CPIO_NUM_HEADERS][CPIO_FIELD_LENGTH];
-	int	Index;
+	char		header[CPIO_FIELD_LENGTH + 1];
-	unsigned long	Value;
+	size_t		i, j;
 	unsigned long	namelen;
-	*Name = NULL;
+	*name = NULL;
-	if (!Read(In, Buffer, sizeof (CPIOMagic)))
+	if (!FileHandleRead(in, buffer, sizeof(CPIOMagic)))
 		return false;
-	if (memcmp(Buffer, CPIOMagic, sizeof (CPIOMagic)) != 0)
+	if (memcmp(buffer, CPIOMagic, sizeof(CPIOMagic)) != 0)
 		return false;
-	if (!Read(In, Buffer, sizeof (Buffer)))
+	if (!FileHandleRead(in, buffer, sizeof(buffer)))
 		return false;
-	Ptr = Buffer;
+	header[CPIO_FIELD_LENGTH] = '\0';
-	Index = sizeof (Buffer);
+	for (i = 0; i < CPIO_NUM_HEADERS; i++) {
-	Value = 0;
+		for (j = 0; j < CPIO_FIELD_LENGTH; j++) {
-	while (Index-- > 0) {
+			if (!isxdigit((unsigned char)buffer[i][j]))
-		Value <<= 4;
+				return false;
-		if ((*Ptr >= '0') && (*Ptr <= '9')) {
+			header[j] = buffer[i][j];
 			Value += (unsigned long)(*Ptr++-'0');
 		} else if ((*Ptr >= 'A') && (*Ptr <= 'F')) {
 				Value += (unsigned long)(*Ptr++-'A') + 10;
 		} else if ((*Ptr >= 'a') && (*Ptr <= 'f')) {
 				Value += (unsigned long)(*Ptr++-'a') + 10;
 		} else {
 			return false;
 		if ((Index % CPIO_FIELD_LENGTH) == 0) {
 			*Fields++ = Value;
 			Value = 0;
+		}
-	Value = Fields[CPIO_HDR_NAMESIZE - CPIO_NUM_HEADERS];
+		fields[i] = strtoul(header, NULL, 16);
 	if ((*Name = GetData(In, Value)) == NULL)
 	namelen = fields[CPIO_HDR_NAMESIZE];
 	if ((*name = GetData(in, namelen)) == NULL)
 		return false;
-	return ((*Name)[Value -1 ] == '\0');
+	return ((*name)[namelen - 1] == '\0');
+}
 static mode_t
-ConvertMode(unsigned long CPIOMode)
+ConvertMode(unsigned long cpio_mode)
+{
-	mode_t	Mode;
+	mode_t	mode;
-	ModeMap	*Ptr;
+	ModeMap	*ptr;
-	Mode = 0;
+	for (ptr = ModeMapTab, mode = 0; ptr->mm_CPIOMode != 0; ptr++) {
-	Ptr = ModeMapTab;
+		if (cpio_mode & ptr->mm_CPIOMode)
-	while (Ptr->mm_CPIOMode != 0) {
+			mode |= ptr->mm_SysMode;
 		if ((CPIOMode & Ptr->mm_CPIOMode) != 0)
 			Mode |= Ptr->mm_SysMode;
 		Ptr++;
+	}
-	return Mode;
+	return mode;
+}
 static bool
 MakeTargetDir(char *Name, PListEntry **Dirs)
+{
 	char		*Basename;
 	PListEntry	*Dir;
 	struct stat	Stat;
 	int	Result;
 	if ((Basename = strrchr(Name, '/')) == NULL)
 		return true;
 	*Basename = '\0';
-	if ((Dir = FindPListEntry(*Dirs, Name)) != NULL) {
+	if ((Dir = PListFind(*Dirs, Name)) != NULL) {
 		*Basename = '/';
 		Dir->pe_DirEmpty = false;
 		return true;
+	}
 	if (!MakeTargetDir(Name, Dirs)) {
 		*Basename = '/';
 		return false;
+	}
 	if (stat(Name, &Stat) == 0) {
 		Result = S_ISDIR(Stat.st_mode);
 	} else if (errno != ENOENT) {
 		Result = false;
 	} else if ((Result = (mkdir(Name, S_IRWXU|S_IRWXG|S_IRWXO) == 0))) {
-		(void)InsertPListEntry(Dirs, Name);
+		(void)PListInsert(Dirs, Name);
+	}
 	*Basename = '/';
 	return Result;
+}
 static bool
-MakeDir(char *Name, mode_t Mode, int *OldDir)
+MakeDir(char *name, mode_t mode, bool *old_dir)
+{
-	struct stat Stat;
+	struct stat sb;
-	*OldDir = false;
+	*old_dir = false;
-	if (mkdir(Name, Mode) == 0)
+	if (mkdir(name, mode) == 0)
 		return true;
-	if ((errno != EEXIST) || (lstat(Name, &Stat) < 0) ||
+	if (errno != EEXIST || lstat(name, &sb) < 0 || !S_ISDIR(sb.st_mode))
 	    !S_ISDIR(Stat.st_mode)) {
 		return false;
-	*OldDir = true;
+	*old_dir = true;
 	return true;
+}
 static bool
 MakeSymLink(char *Link, char *Name)
+{
 	struct stat Stat;
 	if (symlink(Link, Name) == 0) return true;
 	if ((errno != EEXIST) || (lstat(Name, &Stat) < 0) ||
 	    !S_ISLNK(Stat.st_mode)) {
 		return false;
+	}
 	return ((unlink(Name) == 0) && (symlink(Link, Name) == 0));
+}
 static bool
-WriteFile(FileHandle *In, char *Name, mode_t Mode, unsigned long Length,
+WriteFile(FileHandle *in, char *name, mode_t mode, unsigned long length,
-    char *Link)
+    const char *link_target)
+{
-	int		Out;
+	int		outfd;
-	struct stat	Stat;
+	struct stat	sb;
-	static void	*Buffer = NULL;
+	char		buffer[1 << 16];
 	static size_t	BufferSize = 0;
-	if ((lstat(Name, &Stat) == 0) &&
+	if ((lstat(name, &sb) == 0) &&
-	    (!S_ISREG(Stat.st_mode) || (unlink(Name) < 0))) {
+	    (!S_ISREG(sb.st_mode) || (unlink(name) < 0))) {
 		return false;
+	}
-	if (!InitBuffer(&Buffer, &BufferSize))
+	if (link_target != NULL) {
-		return false;
+		if (link(link_target, name) < 0)
 	if (Link != NULL) {
 		if (link(Link, Name) < 0)
 			return false;
-		Out = open(Name, O_WRONLY, Mode);
+		outfd = open(name, O_WRONLY, mode);
 	 } else {
-		Out = open(Name, O_WRONLY|O_CREAT, Mode);
+		outfd = open(name, O_WRONLY|O_CREAT, mode);
+	}
-	if (Out < 0)
+	if (outfd < 0)
 		return false;
-	while (Length > 0) {
+	while (length > 0) {
-		int	Chunk;
+		ssize_t	chunk;
-		Chunk = (Length > BufferSize) ? BufferSize : Length;
+		chunk = (length > sizeof(buffer)) ? sizeof(buffer) : length;
-		if (!Read(In, Buffer, Chunk) ||
+		if (!FileHandleRead(in, buffer, chunk) ||
-		    (write(Out, Buffer, Chunk) != Chunk))
+		    write(outfd, buffer, chunk) != chunk)
 			break;
-		Length -= Chunk;
+		length -= chunk;
+	}
-	if ((close(Out) == 0) && (Length == 0))
+	if (close(outfd) == 0 && length == 0)
-		return SkipAndAlign(In, 0);
+		return SkipAndAlign(in, 0);
-	(void)unlink(Name);
+	(void)unlink(name);
 	return false;
+}
 static void
 CheckSymLinks(PListEntry **Links, PListEntry **Files, PListEntry **Dirs)
+{
 	PListEntry	*Link;
 	while ((Link = *Links) != NULL) {
 		struct stat	Stat;
 		PListEntry	*Ptr;
 		char		*Basename;
 		if (Link->pe_Left != NULL)
 			CheckSymLinks(&Link->pe_Left, Files, Dirs);
 		if ((stat(Link->pe_Name, &Stat) < 0) ||
 		    !S_ISREG(Stat.st_mode)) {
 			Links = &Link->pe_Right;
 			continue;
+		}
-		(void)InsertPListEntry(Files, Link->pe_Name);
+		(void)PListInsert(Files, Link->pe_Name);
 		if ((Basename = strrchr(Link->pe_Name, '/')) != NULL) {
 			*Basename = '\0';
-			if ((Ptr = FindPListEntry(*Dirs,
+			if ((Ptr = PListFind(*Dirs, Link->pe_Name)) != NULL)
 			    Link->pe_Name)) != NULL)
 				Ptr->pe_DirEmpty = false;
+		}
 		if (Link->pe_Right == NULL) {
 			*Links = Link->pe_Left;
 			free(Link);
 			break;
+		}
 		*Links = Link->pe_Right;
 		Ptr = Link->pe_Left;
 		free(Link);
 		if (Ptr == NULL)
 			continue;
 		Link = *Links;
 		while (Link->pe_Left != NULL)
 			Link = Link->pe_Left;
 		Link->pe_Left = Ptr;
+	}
+}
 static bool
-CheckPrefix(char *Prefix, char *Name)
+CheckPrefix(const char *prefix, char *name)
+{
-	int	Length;
+	size_t length;
-	Length = strlen(Prefix);
+	length = strlen(prefix);
-	return ((strncmp(Prefix, Name, Length) == 0) &&
+	return ((strncmp(prefix, name, length) == 0) &&
-	    ((Name[Length] == '\0') || (Name[Length] == '/')));
+	    ((name[length] == '\0') || (name[length] == '/')));
+}
-static char *
+static bool
-StripPrefix(char *Name, int Count)
+StripPrefix(char *name, int stripcount)
+{
-	char *NewName;
+	char *new_name;
-	if (Count <= 0)
+	if (stripcount <= 0)
-		return Name;
+		return true;
-	NewName = Name;
+	new_name = name;
-	while (Count-- > 0) {
+	while (stripcount-- > 0) {
-		NewName = strchr(NewName, '/');
+		new_name = strchr(new_name, '/');
-		if (NewName == NULL)
+		if (new_name == NULL)
-			return NULL;
+			return false;
-		NewName++;
+		new_name++;
+	}
-	(void)memmove(Name, NewName, strlen(NewName) + 1);
+	(void)memmove(name, new_name, strlen(new_name) + 1);
-	return Name;
+	return true;
+}
-int
+static void
-main(int argc, char **argv)
+ProcessRPM(const char *filename, PListEntry **files, PListEntry **dirs,
     char **ignore, const char *prefix, int stripcount)
+{
-	char		*Progname;
+	int		fd;
-	FILE		*PListFile;
+	FileHandle	*in;
-	char		**Ignore, *Prefix;
+	PListEntry	*last;
 	int		Opt, Index, FD, StripCount;
 	PListEntry	*Files, *Dirs;
 	FileHandle	*In;
 	Progname = strrchr(argv[0], '/');
 	if (Progname == NULL)
 		Progname = argv[0];
 	else
 		Progname ++;
-	PListFile = NULL;
+	if ((fd = open(filename, O_RDONLY, 0)) < 0) {
-	Ignore = NULL;
+		perror(filename);
-	Prefix = NULL;
+		exit(EXIT_FAILURE);
 	StripCount = 0;
 	while ((Opt = getopt(argc, argv, "s:d:f:i:p:")) != -1) {
-		switch (Opt) {
+	if (!IsRPMFile(fd)) {
-		case 's':
+		(void)fprintf(stderr, "%s: file is not an RPM package.\n",
-			StripCount = atoi(optarg);
+		    filename);
-			if (StripCount <= 0) {
+		exit(EXIT_FAILURE);
      				(void)fprintf(stderr,
 				    "%s: -s argument \"%s\" "
-				    "must be a positive integer.\n",
+	if ((in = OpenRPM(&fd)) == NULL) {
-				    Progname, optarg);
+		(void)fprintf(stderr, "%s: cannot get RPM data.\n", filename);
-				return EXIT_FAILURE;
+		exit(EXIT_FAILURE);
+	}
-			break;
+	if (fd >= 0) {
-		case 'f':
+		(void)close(fd);
-			if (PListFile != NULL)
+		fd = -1;
 				(void)fclose(PListFile);
 			if ((PListFile = fopen(optarg, "a")) == NULL) {
-				perror(optarg);
+	last = NULL;
-				return EXIT_FAILURE;
+	for (;;) {
 		unsigned long	fields[CPIO_NUM_HEADERS];
-			break;
+		char		*name;
-		case 'i':
+		mode_t		mode;
-			Ignore = ArrayAdd(Ignore, optarg);
+		unsigned long	length;
 			break;
-		case 'd':
+		if (!GetCPIOHeader(in, fields, &name)) {
-			if (chdir(optarg)) {
+			(void)fprintf(stderr,
-				perror(optarg);
+			    "%s: error in cpio header.\n",
-				return EXIT_FAILURE;
+			    filename);
 			exit(EXIT_FAILURE);
 			break;
-		case 'p':
+		if (strcmp(name, CPIO_END_MARKER) == 0) {
-			if (strlen(optarg) > 0)
+			free(name);
 				Prefix = optarg;
 			break;
 		default:
 			Usage(Progname);
+		}
 		if (*name == '\0')
 			fields[CPIO_HDR_MODE] = 0;
 		if (ignore != NULL) {
 			char **ptr;
-	argc -= optind;
+			for (ptr = ignore; *ptr != NULL; ptr++) {
-	argv += optind;
+				if (CheckPrefix(*ptr, name)) {
-	if (argc == 0)
+					fields[CPIO_HDR_MODE] = 0;
-		Usage(Progname);
+					break;
+				}
 	if ((Prefix != NULL) && (Prefix[strlen(Prefix) - 1] != '/'))
 		Prefix = StrCat(Prefix, "/");
 	Files = NULL;
 	Dirs = NULL;
 	for (Index = 0; Index < argc ; Index++) {
 		PListEntry	*Last;
 		if ((FD = open(argv[Index], O_RDONLY, 0)) < 0) {
 			perror(argv[Index]);
 			return EXIT_FAILURE;
+		}
-		if (!IsRPMFile(FD)) {
+		if (fields[CPIO_HDR_MODE] != 0 &&
 		    !StripPrefix(name, stripcount)) {
 			(void)fprintf(stderr,
-			    "%s: file is not an RPM package.\n", argv[Index]);
+				    "%s: Leading path to strip too "
-			return EXIT_FAILURE;
+				    "big (-s %d)\n",
 				    filename, stripcount);
 			exit(EXIT_FAILURE);
+		}
-		if ((In = Open(FD)) == NULL) {
+		if (prefix != NULL) {
-			(void)fprintf(stderr,
+			char *fullname;
 			    "%s: cannot get RPM data.\n", argv[Index]);
-			return EXIT_FAILURE;
+		  	fullname = StrCat(prefix, name);
 			free(name);
 			name = fullname;
+		}
-		Last = NULL;
+		mode = ConvertMode(fields[CPIO_HDR_MODE]);
-		for (;;) {
+		length = fields[CPIO_HDR_FILESIZE];
-			unsigned long	Fields[CPIO_NUM_HEADERS];
+		switch (fields[CPIO_HDR_MODE] & CP_IFMT) {
-			char		*Name;
+		case C_ISDIR: {
-			mode_t		Mode;
+			PListEntry	*dir;
-			unsigned long Length;
+			bool		old_dir;
-			if (!GetCPIOHeader(In, Fields, &Name)) {
+			if (length != 0) {
 				(void)fprintf(stderr,
-				    "%s: error in cpio header.\n",
+				    "%s: error in cpio file.\n",
-				    argv[Index]);
+				filename);
-				return EXIT_FAILURE;
+				exit(EXIT_FAILURE);
+			}
 			if (strcmp(Name, CPIO_END_MARKER) == 0) {
-				free(Name);
+			if (!MakeTargetDir(name, dirs)) {
-				break;
+				(void)fprintf(stderr,
 				    "%s: can't create parent "
 				    "directories for \"%s\".\n",
 		                    filename, name);
 				exit(EXIT_FAILURE);
+			}
 			if (*Name == '\0')
 				Fields[CPIO_HDR_MODE] = 0;
-			if (Ignore != NULL) {
+			if (!MakeDir(name, mode, &old_dir)) {
-				char **Ptr;
+				(void)fprintf(stderr,
 				    "%s: can't create directory "
 				    "\"%s\".\n", filename, name);
 				exit(EXIT_FAILURE);
+			}
-				Ptr = Ignore;
+			if (!old_dir) {
-				while (*Ptr != NULL) {
+				dir = PListInsert(dirs, name);
-					if (CheckPrefix(*Ptr, Name)) {
+				dir->pe_DirEmpty = true;
 						Fields[CPIO_HDR_MODE] = 0;
 						break;
 					Ptr++;
+			}
 			break;
+		}
 		case C_ISLNK: {
 			char *link_target;
-			if (Fields[CPIO_HDR_MODE] != 0 &&
+			if ((link_target = GetData(in, length)) == NULL) {
 			    (Name = StripPrefix(Name, StripCount)) == NULL) {
 				(void)fprintf(stderr,
-					    "%s: Leading path to strip too "
+				    "%s: error in cpio file.\n",
-					    "big (-s %d)\n",
+				filename);
-					    argv[Index], StripCount);
+				exit(EXIT_FAILURE);
 				return EXIT_FAILURE;
+			}
-			if (Prefix != NULL) {
+			if (!MakeTargetDir(name, dirs)) {
-				char *Fullname;
+				(void)fprintf(stderr,
 				    "%s: can't create parent "
-			  	Fullname = StrCat(Prefix, Name);
+				    "directories for \"%s\".\n",
-				free(Name);
+		                    filename, name);
-				Name = Fullname;
+				exit(EXIT_FAILURE);
+			}
-			Mode = ConvertMode(Fields[CPIO_HDR_MODE]);
+			if (*link_target == '/') {
-			Length = Fields[CPIO_HDR_FILESIZE];
+				char *ptr;
 			switch (Fields[CPIO_HDR_MODE] & CP_IFMT) {
 			case C_ISDIR: {
 				PListEntry	*Dir;
 				int		OldDir;
 				if (Length != 0) {
 					(void)fprintf(stderr,
 					    "%s: error in cpio file.\n",
 					argv[Index]);
 					return EXIT_FAILURE;
-				if (!MakeTargetDir(Name, &Dirs)) {
+				(void)memmove(link_target, link_target + 1,
-					(void)fprintf(stderr,
+				    strlen(link_target));
-					    "%s: can't create parent "
+				ptr = name;
-					    "directories for \"%s\".\n",
+				if (prefix != NULL)
-			                    argv[Index], Name);
+					ptr += strlen(prefix);
 					return EXIT_FAILURE;
-				if (!MakeDir(Name, Mode, &OldDir)) {
+				while ((ptr = strchr(ptr, '/')) != NULL) {
-					(void)fprintf(stderr,
+					char *new_link_target;
 					    "%s: can't create directory "
 					    "\"%s\".\n", argv[Index], Name);
 					return EXIT_FAILURE;
-				if (!OldDir) {
+				    	new_link_target = StrCat("../",
-					Dir = InsertPListEntry(&Dirs, Name);
+					    link_target);
-					Dir->pe_DirEmpty = true;
+					free(link_target);
 					link_target = new_link_target;
 					ptr++;
+				}
 				break;
+			}
 			case C_ISLNK: {
 				char	*Link;
-				if ((Link = GetData(In, Length)) == NULL) {
+			if (!MakeSymLink(link_target, name)) {
-					(void)fprintf(stderr,
+				(void)fprintf(stderr,
-					    "%s: error in cpio file.\n",
+				    "%s: can't create symbolic link "
-					argv[Index]);
+				    "\"%s\".\n", filename, name);
-					return EXIT_FAILURE;
+				exit(EXIT_FAILURE);
+			}
-				if (!MakeTargetDir(Name, &Dirs)) {
+	    		PListInsert(files, name)->pe_Link = link_target;
-					(void)fprintf(stderr,
+			break;
 					    "%s: can't create parent "
-					    "directories for \"%s\".\n",
+		case C_ISREG:
-			                    argv[Index], Name);
+			if (!MakeTargetDir(name, dirs)) {
-					return EXIT_FAILURE;
+				(void)fprintf(stderr,
 				    "%s: can't create parent "
 				    "directories for \"%s\".\n",
 		                    filename, name);
 				exit(EXIT_FAILURE);
+			}
 				if (*Link == '/') {
 					char	*Ptr;
-					(void)memmove(Link, Link + 1,
+			if ((last != NULL) && (last->pe_INode !=
-					    strlen(Link + 1) + 1);
+			    fields[CPIO_HDR_INODE])) {
-					Ptr = Name;
+				last = NULL;
 					if (Prefix != NULL)
 						Ptr += strlen(Prefix);
 					while ((Ptr = strchr(Ptr, '/'))
 					    != NULL) {
 						char *NewLink;
 					    	NewLink = StrCat("../", Link);
 						free(Link);
 						Link = NewLink;
 						Ptr++;
-				if (!MakeSymLink(Link, Name)) {
+			if (!WriteFile(in, name, mode, length,
-					(void)fprintf(stderr,
+			    (last != NULL)? last->pe_Name : NULL)) {
-					    "%s: can't create symbolic link "
+				(void)fprintf(stderr,
-					    "\"%s\".\n", argv[Index], Name);
+		                    "%s: can't write file \"%s\".\n",
-					return EXIT_FAILURE;
+		                    filename, name);
 				exit(EXIT_FAILURE);
+			}
-		    		InsertPListEntry(&Files, Name)->pe_Link = Link;
+			last = PListInsert(files, name);
-				break;
+			last->pe_INode = fields[CPIO_HDR_INODE];
 			break;
 		default:
 			if (length > 0 && !SkipAndAlign(in, length)) {
 				(void)fprintf(stderr,
 				    "%s: error in cpio file.\n",
 				    filename);
 				exit(EXIT_FAILURE);
+			}
 			case C_ISREG:
 				if (!MakeTargetDir(Name, &Dirs)) {
 					(void)fprintf(stderr,
 					    "%s: can't create parent "
 					    "directories for \"%s\".\n",
 			                    argv[Index], Name);
 					return EXIT_FAILURE;
 		free(name);
+	}
-				if ((Last != NULL) && (Last->pe_INode !=
+	FileHandleClose(in);
 				    Fields[CPIO_HDR_INODE])) {
 					Last = NULL;
-				if (!WriteFile(In, Name, Mode, Length,
+int
-				    (Last != NULL)? Last->pe_Name : NULL)) {
+main(int argc, char **argv)
 					(void)fprintf(stderr,
-			                    "%s: can't write file \"%s\".\n",
+	char		*progname;
-			                    argv[Index],
+	FILE		*plist_file;
-			                    Name);
+	char		**ignore, *prefix;
-					return EXIT_FAILURE;
+	int		opt, stripcount, i;
 	PListEntry	*files, *dirs;
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
 		progname = argv[0];
 	else
 		progname++;
-				Last = InsertPListEntry(&Files, Name);
+	plist_file = NULL;
-				Last->pe_INode = Fields[CPIO_HDR_INODE];
+	ignore = NULL;
-				break;
+	prefix = NULL;
-			default:
+	stripcount = 0;
-				if ((Length > 0) &&
+	while ((opt = getopt(argc, argv, "d:f:i:p:s:")) != -1) {
-				    !SkipAndAlign(In, Length)) {
+		switch (opt) {
-					(void)fprintf(stderr,
+		case 'd':
-					    "%s: error in cpio file.\n",
+			if (chdir(optarg)) {
-					    argv[Index]);
+				perror(optarg);
-					return EXIT_FAILURE;
+				return EXIT_FAILURE;
+			}
 			break;
-			free(Name);
+		case 'f':
 			if (plist_file != NULL)
 				(void)fclose(plist_file);
 			if ((plist_file = fopen(optarg, "a")) == NULL) {
 				perror(optarg);
 				return EXIT_FAILURE;
+			}
 			break;
 		case 'i':
 			ignore = ArrayAdd(ignore, optarg);
 			break;
-		Close(In);
+		case 'p':
-		(void)close(FD);
+			if (strlen(optarg) > 0)
 				prefix = optarg;
 			break;
 		case 's':
 			stripcount = atoi(optarg);
 			if (stripcount <= 0) {
 				(void)fprintf(stderr,
 				    "%s: -s argument \"%s\" "
 				    "must be a positive integer.\n",
 				    progname, optarg);
 				return EXIT_FAILURE;
+			}
 			break;
 		default:
 			Usage(progname);
+		}
+	}
-	if (PListFile != NULL) {
+	if (argc == optind)
-		ProcessPList(Files, PListEntryFile, PListFile);
+		Usage(progname);
 		ProcessPList(Dirs, PListEntryMakeDir, PListFile);
-		(void)fclose(PListFile);
+	if (prefix != NULL && prefix[strlen(prefix) - 1] != '/')
 		prefix = StrCat(prefix, "/");
 	files = NULL;
 	dirs = NULL;
 	for (i = optind; i < argc ; i++)
 		ProcessRPM(argv[i], &files, &dirs, ignore, prefix, stripcount);
 	if (plist_file != NULL) {
 		PListWrite(files, dirs, plist_file);
 		(void)fclose(plist_file);
+	}
 	return EXIT_SUCCESS;
+}

 @@ -1,47 +1,34 @@
-# $NetBSD: Makefile,v 1.55 2010/12/30 00:39:15 tron Exp $
+# $NetBSD: Makefile,v 1.56 2011/01/12 00:26:33 tron Exp $
-DISTNAME=	rpm2pkg-3.1.8
+DISTNAME=	rpm2pkg-3.2.0
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 NO_CHECKSUM=	yes
 OWNER=		tron@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
+HOMEPAGE=	http://www.pkgsrc.org/
 COMMENT=	Convert RPM archives to NetBSD packages
 LICENSE=	modified-bsd
 CONFLICTS+=	suse-base<=6.4
 PKG_DESTDIR_SUPPORT=	user-destdir
-USE_LANGUAGES=	c99
+MANCOMPRESSED_IF_MANZ=	yes
-USE_TOOLS+=	xzcat:run
+USE_BSD_MAKEFILE=	yes
-WRKSRC=		${WRKDIR}
+USE_LANGUAGES=		c99
-CPPFLAGS+=	${BUILDLINK_CPPFLAGS.bzip2} \
+MAKE_ENV+=	FILESDIR=${FILESDIR:Q}
-		${BUILDLINK_CPPFLAGS.zlib} -DXZCAT=\"${TOOLS_PATH.xzcat:Q}\"
+MAKE_FILE=	${FILESDIR}/Makefile
-LIBS+=		-lz -lbz2
+WRKSRC=		${WRKDIR}
 .include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-*)
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 sbin
 CFLAGS+=	-Wall -Wshadow -Wsign-compare -Wunused-value
 .endif
 CFLAGS+=	-g
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 do-build:
 	cd ${WRKSRC}; ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o rpm2pkg \
 		${FILESDIR}/rpm2pkg.c ${LIBS}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:19:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/01/12 00:26:33 tron Exp $
 sbin/rpm2pkg
 man/cat8/rpm2pkg.0
 man/man8/rpm2pkg.8

 @@ -1,36 +1,28 @@
 .\"	$NetBSD: rpm2pkg.8,v 1.5 2001/12/03 19:03:23 wiz Exp $
 .\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2001, 2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Emmanuel Dreyfus.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\" This product includes software developed by the NetBSD
 .\" Foundation, Inc. and its contributors.
 .\" 4. Neither the name of The NetBSD Foundation nor the names of its
 .\"    contributors may be used to endorse or promote products derived
 .\"    from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 @@ -140,22 +132,18 @@ file in
 while striping the leading directory of files path in
 .Ar bar.rpm .
 This is useful for dealing with RPM archives that contains files like
 .Pa usr/bin/foo ,
 which you would like to go in
 .Pa /usr/pkg/bin .
 .Sh COMPATIBILITY
 .Nm
 should work with any regular RPM file.
 .Sh SEE ALSO
 .Xr cpio 1 ,
 .Xr rpm 8 ,
 .Xr rpm2cpio 8
 .br
 .Em Dq Documentation on the NetBSD Package System ,
 .An Hubert Feyrer Aq hubert.feyrer@informatik.fh-regensburg.de ,
 .An Alistair Crooks Aq agc@pkgsrc.org
 .Sh AUTHORS
 .An Matthias Scheler Aq tron@netbsd.org
 .br
 This man page was written by
 .An Emmanuel Dreyfus Aq manu@netbsd.org