From owner-cvs-src-old@FreeBSD.ORG Tue Feb 16 22:53:37 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4BEC1065679 for ; Tue, 16 Feb 2010 22:53:37 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D484D8FC0A for ; Tue, 16 Feb 2010 22:53:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1GMrbr3096397 for ; Tue, 16 Feb 2010 22:53:37 GMT (envelope-from gavin@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1GMrbEN096395 for cvs-src-old@freebsd.org; Tue, 16 Feb 2010 22:53:37 GMT (envelope-from gavin@repoman.freebsd.org) Message-Id: <201002162253.o1GMrbEN096395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to gavin@repoman.freebsd.org using -f From: Gavin Atkinson Date: Tue, 16 Feb 2010 22:53:18 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.bin/unzip unzip.1 unzip.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2010 22:53:38 -0000 gavin 2010-02-16 22:53:18 UTC FreeBSD src repository Modified files: usr.bin/unzip unzip.1 unzip.c Log: SVN rev 203977 on 2010-02-16 22:53:18Z by gavin Implement the rename query, for when a file with the same name as the one about to be extracted already exists. The question, and interpretation of the response is deliberately compatible with Info-Zip. This change was originally obtained from NetBSD, but has three changes: - better compatibility with Info-Zip in the handling of ^D - Use getdelim() rather than getline() - bug fix: != changed to == in the "file rename" code I suspect the latter is also a bug in NetBSD, but I can't easily confirm this. PR: bin/143307 Reviewed by: rdivacky (change to unzip.c only) Obtained from: NetBSD src/usr.bin/unzip/unzip.c 1.8 MFC after: 1 month Revision Changes Path 1.4 +0 -11 src/usr.bin/unzip/unzip.1 1.6 +69 -17 src/usr.bin/unzip/unzip.c