diff options
author | ak <ak@FreeBSD.org> | 2016-01-15 23:04:36 +0000 |
---|---|---|
committer | ak <ak@FreeBSD.org> | 2016-01-15 23:04:36 +0000 |
commit | 4a483c2c396fcf156e04e080cce09e28143f5073 (patch) | |
tree | 43c45213cf158d2f675efef81ce5baee946b8cc1 /usr.bin | |
parent | 75fde03a59bb936e9e6c51994af58fa76d630f9f (diff) | |
download | FreeBSD-src-4a483c2c396fcf156e04e080cce09e28143f5073.zip FreeBSD-src-4a483c2c396fcf156e04e080cce09e28143f5073.tar.gz |
- Match directory extraction message with Infozip [1]
- Add comment explaining masks in check_binary()
Obtained from: NetBSD [1]
Approved by: des
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/unzip/unzip.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c index 0e8663e..fb123db 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); } |