From owner-svn-src-all@FreeBSD.ORG Fri Dec 11 13:14:15 2009 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 505741065676; Fri, 11 Dec 2009 13:14:15 +0000 (UTC) (envelope-from gary.jennejohn@freenet.de) Received: from mout0.freenet.de (mout0.freenet.de [IPv6:2001:748:100:40::2:2]) by mx1.freebsd.org (Postfix) with ESMTP id D656A8FC0C; Fri, 11 Dec 2009 13:14:14 +0000 (UTC) Received: from [195.4.92.25] (helo=15.mx.freenet.de) by mout0.freenet.de with esmtpa (ID gary.jennejohn@freenet.de) (port 25) (Exim 4.70 #1) id 1NJ5K1-000634-HV; Fri, 11 Dec 2009 14:14:13 +0100 Received: from p57ae037d.dip0.t-ipconnect.de ([87.174.3.125]:31054 helo=ernst.jennejohn.org) by 15.mx.freenet.de with esmtpa (ID gary.jennejohn@freenet.de) (port 25) (Exim 4.69 #94) id 1NJ5K1-0001bi-2h; Fri, 11 Dec 2009 14:14:13 +0100 Date: Fri, 11 Dec 2009 14:14:12 +0100 From: Gary Jennejohn To: Dag-Erling =?ISO-8859-1?Q?Sm=F8rgrav?= Message-ID: <20091211141412.15afcf43@ernst.jennejohn.org> In-Reply-To: <86k4wtn2p3.fsf@ds4.des.no> References: <200912031802.nB3I2txS021472@svn.freebsd.org> <20091210163118.GA66146@lizard.fafoe.narf.at> <20091210173231.GA93327@freebsd.org> <86k4wtn2p3.fsf@ds4.des.no> X-Mailer: Claws Mail 3.7.3 (GTK+ 2.16.2; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, Roman Divacky , Stefan Farfeleder , svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r200068 - head/usr.bin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: gary.jennejohn@freenet.de List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2009 13:14:15 -0000 On Fri, 11 Dec 2009 12:57:12 +0100 Dag-Erling Sm__rgrav wrote: > Roman Divacky writes: > > Stefan Farfeleder wrote: > > > For me this breaks the ooo-3 build with: > > > > > > unzip: -n, -o and -u are contradictory > > > > > > The failing command is 'unzip -quo jurt_src.zip'. > > > > I dont see a reason why this check is there: > > > > if (n_opt + o_opt + u_opt > 1) > > errorx("-n, -o and -u are contradictory"); > > > > > > dag, can you comment? > > s/dag/des/, please. > > The bug is in OOo. > > If you look at extract_file(), you'll see that these three options are > handled in three separate branches of a multi-branch if. > > -n means "never overwrite" > -o means "always overwrite" > -u means "sometimes overwrite" > > so -uo does not make much sense, and -n along with either -u or -o does > not make any sense whatsoever. > > > /usr/local/bin/unzip seems to accept those together happilly.. > > You should check if: > > a) -uo gives the same result as -u > b) -uo gives the same result as -o > c) -ou gives the same result as -u > d) -ou gives the same result as -o > e) -uo and -ou give the same result > > My guess would be either bc or bde. In either case, there is a risk > that this is not what the user wanted, so IMHO the best solution is to > not do anything at all. > root:ernst:~:bash:21> /usr/local/bin/unzip --help -u update files, create if necessary -n never overwrite existing files -o overwrite files WITHOUT prompting I deleted all but uon. -u has a totally different meaning. Evidently o and n can be combined without any problem. --- Gary Jennejohn