summaryrefslogtreecommitdiff
path: root/usr.bin/unzip
diff options
context:
space:
mode:
authorAlex Kozlov <ak@FreeBSD.org>2016-01-15 23:04:36 +0000
committerAlex Kozlov <ak@FreeBSD.org>2016-01-15 23:04:36 +0000
commitb5acc1891f05f8ded96e170018ef75a006e78046 (patch)
tree43c45213cf158d2f675efef81ce5baee946b8cc1 /usr.bin/unzip
parentb2a265d3cd88a884b77e76fc13454893ef34621e (diff)
downloadsrc-test2-b5acc1891f05f8ded96e170018ef75a006e78046.tar.gz
src-test2-b5acc1891f05f8ded96e170018ef75a006e78046.zip
- Match directory extraction message with Infozip [1]
- Add comment explaining masks in check_binary() Obtained from: NetBSD [1] Approved by: des
Notes
Notes: svn path=/head/; revision=294108
Diffstat (limited to 'usr.bin/unzip')
-rw-r--r--usr.bin/unzip/unzip.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c
index 0e8663e2f8f0..fb123db30adb 100644
--- a/usr.bin/unzip/unzip.c
+++ b/usr.bin/unzip/unzip.c
@@ -403,7 +403,7 @@ extract_dir(struct archive *a, struct archive_entry *e, const char *path)
if (mode & 0004)
mode |= 0001;
- info("d %s\n", path);
+ info(" creating: %s/\n", path);
make_dir(path, mode);
ac(archive_read_data_skip(a));
}
@@ -466,7 +466,9 @@ handle_existing_file(char **path)
* one white-listed byte has to be found.
*
* Black-listed: 0..6, 14..25, 28..31
+ * 0xf3ffc07f = 11110011111111111100000001111111b
* White-listed: 9..10, 13, >= 32
+ * 0x00002600 = 00000000000000000010011000000000b
*
* See the proginfo/txtvsbin.txt in the zip sources for a detailed discussion.
*/
@@ -930,7 +932,8 @@ static void
usage(void)
{
- fprintf(stderr, "Usage: unzip [-aCcfjLlnopqtuvyZ1] [-d dir] [-x pattern] zipfile\n");
+ fprintf(stderr, "Usage: unzip [-aCcfjLlnopqtuvyZ1] [-d dir] [-x pattern] "
+ "zipfile\n");
exit(1);
}