From owner-cvs-all@FreeBSD.ORG Wed May 23 10:02:20 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA3D116A41F; Wed, 23 May 2007 10:02:20 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 5511613C45D; Wed, 23 May 2007 10:02:19 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id C8452487F0; Wed, 23 May 2007 12:02:18 +0200 (CEST) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id C1E1745696; Wed, 23 May 2007 12:02:13 +0200 (CEST) Date: Wed, 23 May 2007 12:02:03 +0200 From: Pawel Jakub Dawidek To: Dag-Erling Smorgrav Message-ID: <20070523100203.GB7428@garage.freebsd.pl> References: <200705230812.l4N8CZQi038702@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qDbXVdCdHGoSgWSk" Content-Disposition: inline In-Reply-To: <200705230812.l4N8CZQi038702@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r804 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/lib/libutil flopen.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2007 10:02:20 -0000 --qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, May 23, 2007 at 08:12:34AM +0000, Dag-Erling Smorgrav wrote: > des 2007-05-23 08:12:34 UTC >=20 > FreeBSD src repository >=20 > Modified files: > lib/libutil flopen.c=20 > Log: > If (flags & O_TRUNC), don't truncate the file until we've successfully > locked it. > =20 > MFC after: 3 weeks > =20 > Revision Changes Path > 1.5 +11 -1 src/lib/libutil/flopen.c >=20 > http://cvsweb.FreeBSD.org/src/lib/libutil/flopen.c.diff?r1=3D1.4&r2=3D1.5= &f=3Dh > --- src/lib/libutil/flopen.c 2007/05/10 15:01:42 1.4 > +++ src/lib/libutil/flopen.c 2007/05/23 08:12:34 1.5 > @@ -26,7 +26,7 @@ > */ > =20 > #include > -__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/lib/libutil/flope= n.c,v 1.4 2007/05/10 15:01:42 des Exp $"); > +__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/lib/libutil/flope= n.c,v 1.5 2007/05/23 08:12:34 des Exp $"); > =20 > #include > #include > @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: /usr/local/www/cvsro > int > flopen(const char *path, int flags, ...) > { > - int fd, operation, serrno; > + int fd, operation, serrno, truncate; > struct stat sb, fsb; > mode_t mode; > =20 > @@ -62,6 +62,9 @@ flopen(const char *path, int flags, ...) > if (flags & O_NONBLOCK) > operation |=3D LOCK_NB; > =20 > + truncate =3D (flags & O_TRUNC); > + flags |=3D ~O_TRUNC; flags &=3D ~O_TRUNC ? --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --qDbXVdCdHGoSgWSk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFGVBEbForvXbEpPzQRAv6dAJ9NalVojDTK2RSY8UwQdzrSxSwCiwCeKyzA 3kX4M8gqBtevdeLU6Ou5Y28= =GrPz -----END PGP SIGNATURE----- --qDbXVdCdHGoSgWSk--