From owner-svn-src-all@FreeBSD.ORG Fri Dec 11 11:57: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 4E085106566B; Fri, 11 Dec 2009 11:57:15 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id 056A88FC08; Fri, 11 Dec 2009 11:57:14 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 1F9916D41D; Fri, 11 Dec 2009 11:57:13 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id E9DFA844E9; Fri, 11 Dec 2009 12:57:12 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Roman Divacky References: <200912031802.nB3I2txS021472@svn.freebsd.org> <20091210163118.GA66146@lizard.fafoe.narf.at> <20091210173231.GA93327@freebsd.org> Date: Fri, 11 Dec 2009 12:57:12 +0100 In-Reply-To: <20091210173231.GA93327@freebsd.org> (Roman Divacky's message of "Thu, 10 Dec 2009 18:32:31 +0100") Message-ID: <86k4wtn2p3.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Stefan Farfeleder , 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 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 11:57:15 -0000 Roman Divacky writes: > Stefan Farfeleder wrote: > > For me this breaks the ooo-3 build with: > >=20 > > unzip: -n, -o and -u are contradictory > >=20 > > 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. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no