From bbd559bc7aba030db24da6787f3822fa81c4ce57 Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Sat, 9 Feb 2002 19:33:53 +0000
Subject: [PATCH] Exit the file_init "recursion" only if we are actually
 already trying for a second time. Checking for the plain temp filename was
 not enough, as it may be set even though we are calling the function for the
 first time.

fixes bin/15474 by Chuck Cranor
---
 usr.bin/vi/common/exf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index 2b4423897cc7..2ae969e1bc04 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: exf.c,v 1.6 2002/01/13 11:57:38 aymeric Exp $	*/
+/*	$NetBSD: exf.c,v 1.7 2002/02/09 19:33:53 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -187,7 +187,7 @@ file_init(sp, frp, rcv_name, flags)
 		/*
 		 * Don't try to create a temporary support file twice.
 		 */
-		if (frp->tname != NULL)
+		if (frp->tname != NULL && LF_ISSET(FS_OPENERR))
 			goto err;
 		if (opts_empty(sp, O_DIRECTORY, 0))
 			goto err;