From owner-svn-src-head@FreeBSD.ORG  Wed Jan  6 06:35:11 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D6511065694;
	Wed,  6 Jan 2010 06:35:11 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F13198FC0C;
	Wed,  6 Jan 2010 06:35:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o066ZAU7040887;
	Wed, 6 Jan 2010 06:35:10 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o066ZArO040885;
	Wed, 6 Jan 2010 06:35:10 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <201001060635.o066ZArO040885@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Wed, 6 Jan 2010 06:35:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201630 - head/usr.bin/unzip
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2010 06:35:11 -0000

Author: kientzle
Date: Wed Jan  6 06:35:10 2010
New Revision: 201630
URL: http://svn.freebsd.org/changeset/base/201630

Log:
  When restoring files, use the mode for the mode.
  
  Thanks to: Jun Kuriyama for pointing this out

Modified:
  head/usr.bin/unzip/unzip.c

Modified: head/usr.bin/unzip/unzip.c
==============================================================================
--- head/usr.bin/unzip/unzip.c	Wed Jan  6 05:58:07 2010	(r201629)
+++ head/usr.bin/unzip/unzip.c	Wed Jan  6 06:35:10 2010	(r201630)
@@ -383,7 +383,7 @@ extract_dir(struct archive *a, struct ar
 {
 	int mode;
 
-	mode = archive_entry_filetype(e) & 0777;
+	mode = archive_entry_mode(e) & 0777;
 	if (mode == 0)
 		mode = 0755;
 
@@ -425,7 +425,7 @@ extract_file(struct archive *a, struct a
 	ssize_t len;
 	unsigned char *p, *q, *end;
 
-	mode = archive_entry_filetype(e) & 0777;
+	mode = archive_entry_mode(e) & 0777;
 	if (mode == 0)
 		mode = 0644;
 	mtime = archive_entry_mtime(e);