From owner-svn-src-head@FreeBSD.ORG  Wed Jun  1 15:48:44 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 448CB1065673;
	Wed,  1 Jun 2011 15:48:44 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 35AB18FC17;
	Wed,  1 Jun 2011 15:48:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p51Fmi0K076292;
	Wed, 1 Jun 2011 15:48:44 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p51FmibR076290;
	Wed, 1 Jun 2011 15:48:44 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201106011548.p51FmibR076290@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Wed, 1 Jun 2011 15:48:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222568 - head/usr.sbin/kbdmap
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2011 15:48:44 -0000

Author: jh
Date: Wed Jun  1 15:48:43 2011
New Revision: 222568
URL: http://svn.freebsd.org/changeset/base/222568

Log:
  Don't try to close the stream if fopen(3) fails.
  
  PR:		bin/155349
  Submitted by:	Urankar Mikael

Modified:
  head/usr.sbin/kbdmap/kbdmap.c

Modified: head/usr.sbin/kbdmap/kbdmap.c
==============================================================================
--- head/usr.sbin/kbdmap/kbdmap.c	Wed Jun  1 15:46:26 2011	(r222567)
+++ head/usr.sbin/kbdmap/kbdmap.c	Wed Jun  1 15:48:43 2011	(r222568)
@@ -226,10 +226,10 @@ get_font(void)
 				}
 			}
 		}
+		fclose(fp);
 	} else
 		fprintf(stderr, "Could not open %s for reading\n", sysconfig);
 
-	fclose(fp);
 	return fnt;
 }