From owner-p4-projects@FreeBSD.ORG  Wed Oct 26 08:19:38 2005
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 D6DD516A421; Wed, 26 Oct 2005 08:19:37 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 778A116A41F
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 08:19:37 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4468743D45
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 08:19:37 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9Q8JbSA099902
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 08:19:37 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q8JbPn099899
	for perforce@freebsd.org; Wed, 26 Oct 2005 08:19:37 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 26 Oct 2005 08:19:37 GMT
Message-Id: <200510260819.j9Q8JbPn099899@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85885 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: Wed, 26 Oct 2005 08:19:38 -0000

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

Change 85885 by peter@peter_overcee on 2005/10/26 08:18:45

	Fix fdcontrol to actually work. can't set params in readonly mode.
	fdread can't set params either, so it has to O_RDWR.

Affected files ...

.. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#6 edit
.. //depot/projects/hammer/usr.sbin/fdread/fdread.c#3 edit

Differences ...

==== //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#6 (text+ko) ====

@@ -120,7 +120,6 @@
 		mode = O_RDONLY | O_NONBLOCK;
 	else
 		mode = O_RDWR;
-mode = O_RDONLY | O_NONBLOCK;
 
 	if((fd = open(argv[0], mode)) < 0)
 		err(EX_UNAVAILABLE, "open(%s)", argv[0]);

==== //depot/projects/hammer/usr.sbin/fdread/fdread.c#3 (text+ko) ====

@@ -149,7 +149,7 @@
 			err(EX_OSERR, "cannot create output file %s", fname);
 	}
 
-	if ((fd = open(_devname, O_RDONLY)) == -1)
+	if ((fd = open(_devname, O_RDWR)) == -1)
 		err(EX_OSERR, "cannot open device %s", _devname);
 
 	return (numids? doreadid(fd, numids, trackno): doread(fd, of, _devname));