From 7a6efebc84ac15fc4b596886b91780ea44e8d79c Mon Sep 17 00:00:00 2001
From: ray <ray@openbsd.org>
Date: Thu, 15 Jul 2010 18:23:50 +0000
Subject: Die immediately if pread fails. It's a fatal error so treat it as
 such. Besides, we weren't handling the NULL being returned.

From diff. Minor nit by nicm.

OK xsa stsp nicm
---
 usr.bin/rcs/diff.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'usr.bin/rcs/diff.c')

diff --git a/usr.bin/rcs/diff.c b/usr.bin/rcs/diff.c
index 7c5383ddbdc..4b806bb5d00 100644
--- a/usr.bin/rcs/diff.c
+++ b/usr.bin/rcs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.28 2010/07/15 18:19:18 ray Exp $	*/
+/*	$OpenBSD: diff.c,v 1.29 2010/07/15 18:23:50 ray Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -842,11 +842,8 @@ preadline(int fd, size_t rlen, off_t off)
 	ssize_t nr;
 
 	line = xmalloc(rlen + 1);
-	if ((nr = pread(fd, line, rlen, off)) < 0) {
-		warn("preadline failed");
-		xfree(line);
-		return (NULL);
-	}
+	if ((nr = pread(fd, line, rlen, off)) < 0)
+		err(D_ERROR, "preadline");
 	line[nr] = '\0';
 	return (line);
 }
-- 
cgit v1.2.3-59-g8ed1b