From owner-p4-projects@FreeBSD.ORG  Mon Jul 16 03:03:26 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 18FE016A403; Mon, 16 Jul 2007 03:03:26 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C652716A400
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 03:03:25 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B63C813C428
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 03:03:25 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6G33Pqr000250
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 03:03:25 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G33PoX000247
	for perforce@freebsd.org; Mon, 16 Jul 2007 03:03:25 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 16 Jul 2007 03:03:25 GMT
Message-Id: <200707160303.l6G33PoX000247@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123578 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2007 03:03:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=123578

Change 123578 by gcooper@optimus-revised_pkgtools on 2007/07/16 03:02:24

	2 mistakes.
		-Make sure that fd isn't NULL, instead of NULL.
		-It's not O_RDONLY, it's "r" for fopen. Funny why gcc didn't pick up that error...

Affected files ...

.. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#7 edit

Differences ...

==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#7 (text+ko) ====

@@ -195,9 +195,9 @@
 {
     char *contents;
 
-    FILE *fd = fopen(fname, O_RDONLY);
+    FILE *fd = fopen(fname, "r");
 
-    if (fd != NULL) {
+    if (fd == NULL) {
 	cleanup(0);
 	errx(2, "%s: unable to open '%s' for reading", __func__, fname);
     }