- Minor fixes

- Take maintainership

RIP nox@

2 files changed, 6 insertions, 6 deletions

diff --git a/archivers/rpm2cpio/Makefile b/archivers/rpm2cpio/Makefile
index 76de4f4c9cf7..b0a6d587f105 100644
--- a/archivers/rpm2cpio/Makefile
+++ b/archivers/rpm2cpio/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	rpm2cpio
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	# none
 DISTFILES=	# none
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Convert .rpm files for extraction with /usr/bin/cpio, needs just perl
 
 NO_WRKSUBDIR=	yes
diff --git a/archivers/rpm2cpio/files/rpm2cpio b/archivers/rpm2cpio/files/rpm2cpio
index 8f75375af53c..7f52d1a062f2 100644
--- a/archivers/rpm2cpio/files/rpm2cpio
+++ b/archivers/rpm2cpio/files/rpm2cpio
@@ -44,14 +44,14 @@ if ($#ARGV == -1) {
 	exit 0;
 }
 
-read $f, $rpm, 96;
+die "No header\n" unless (96 == read $f, $rpm, 96);
 
 my ($magic, $major, undef) = unpack("NCC", $rpm);
 
 die "Not an RPM\n" if $magic != 0xedabeedb;
 die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4;
 
-read $f, $rpm, 16 or die "No header\n";
+die "No header\n" unless (16 == read $f, $rpm, 16);
 while(1) {
 	($magic, undef, my $sections, my $bytes) = unpack("N4", $rpm);
 	my ($smagic, $smagic2) = unpack("nN", $rpm);
@@ -82,9 +82,9 @@ while(1) {
 	# skip the headers
 	seek $f, 16 * $sections + $bytes, 1 or die "File is too small\n";
 	do {
-		read $f, $rpm, 1 or die "No header\n" ;
+		read $f, $rpm, 1 or die "No header\n";
 	} while(0 == unpack("C", $rpm));
-	read $f, $rpm, 15, 1 or die "No header\n" ;
+	die "No header\n" unless (15 == read $f, $rpm, 15, 1);
 }
 
 open(ZCAT, "| $filter") or die "can't pipe to $filter\n";