[src/trunk]: src/usr.bin/unzip When restoring files, use the mode, not the fi...

[mbalmer <mbalmer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e846bd168c2b
branches:  trunk
changeset: 750641:e846bd168c2b
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Sat Jan 09 09:27:42 2010 +0000

description:
When restoring files, use the mode, not the filetype, for the mode.
>From FreeBSD (r201630)

diffstat:

 usr.bin/unzip/unzip.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 310d5fdce388 -r e846bd168c2b usr.bin/unzip/unzip.c
--- a/usr.bin/unzip/unzip.c     Sat Jan 09 09:19:18 2010 +0000
+++ b/usr.bin/unzip/unzip.c     Sat Jan 09 09:27:42 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: unzip.c,v 1.10 2009/10/25 20:14:50 wiz Exp $ */
+/* $NetBSD: unzip.c,v 1.11 2010/01/09 09:27:42 mbalmer Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: unzip.c,v 1.10 2009/10/25 20:14:50 wiz Exp $");
+__RCSID("$NetBSD: unzip.c,v 1.11 2010/01/09 09:27:42 mbalmer Exp $");
 
 #include <sys/queue.h>
 #include <sys/stat.h>
@@ -388,7 +388,7 @@
 {
        int mode;
 
-       mode = archive_entry_filetype(e) & 0777;
+       mode = archive_entry_mode(e) & 0777;
        if (mode == 0)
                mode = 0755;
 
@@ -472,7 +472,7 @@
        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);