From nobody Sun Jan 22 10:47:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P091L27K6z32J52; Sun, 22 Jan 2023 10:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P091L0Mvwz3nq7; Sun, 22 Jan 2023 10:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674384470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDhm+4o6qb5opO2Yt5ushNiArefA6oqjeZwST1VIc4U=; b=Kfyh0cVVGfUxTzA8a2jgepevUHZGkiJ++ehc8262eKz8xrzHYWIUyKn/6XWK4GqHZb+8ER uIjzIa0fzu0YtyHBhXQh2tv+jlImsFvcyF8W1dLSHVa9PLbcVXFWzhZWJ8QiMnWXKu8s1S FPyxt2wl5OgZQOmzOQc/sdE7US0fA6m66n7ns9v4PVZOVFvhDM6ovIT6hLjEA1eMjrsNq2 /dXwnqAZydN3KtyxZD1TF5dvRvmbyai1TiNUZuGjy9IdQvQ5yBqegOlkJmKR3HD0Z6k6t2 5YvRMoHiiAJkQnOSfJxFde0XCTBygqp0JB2ehUgK3cgQUhp3fxr38tdvjIwz0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674384470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDhm+4o6qb5opO2Yt5ushNiArefA6oqjeZwST1VIc4U=; b=mkXK9ILQ0nBjO2KOx1hSzOCqd/DztMgYh+VNBnS/iF0F0YamY4OSd7MPse411XKsDj24VC kv/zOXYB3KWDYrTNIeS47KtekQww+nch1ChQfWjhMPUR8h4V3HESHkwDPtPiofGUR1uWtP 5lMFsX6T1fLGKKjaaY6OvR3A5AvSt+geiSq3MAX9jwToRckt5JCPnqbQjCRdMXWtvzTvBi kJXN2WEsoyxb9YD4jIqIn/Pt4LReR1MDlupwUxRE06I9PaiFaRBAvEu8kIRt6zGl5sjYm1 hWYI6ZUP9UHOfzEqSh84gvIOxEDDURUCYgIrTXBtIeAnqG327wijYEfZQEum1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674384470; a=rsa-sha256; cv=none; b=QIVbxvQPFRF0Mq9wwglzIW99o7AS/FZLhfUghDf5sLDkH9nAw9iWvV6QhhVETBhMOXtLFW 7YCCLss6hvd43/fdtZavviAKOOeLFhsknTMgdQKGLAwdNr5phvSAcGO2YkLoBI8QuSZDQ6 dPDP/tTriOGzXcNYXIS9jE4mA4GbQzjJED6Ky1xESG1kcQif2p9Cd+qL2iXT2yLhgi6yBC LwEIQd/vnYLEtH/PaiACWM1dXJ1jlUYAfLf2bPUnNl5jka2huWcIwlxSje1KOfcnb+PWYp TKe2Hm3LCxRLMDFZpNJwMG80s39pyLxa+95uTQDqvEjrDh7sKW0CYsm/dJXuhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P091K6RZmzmSV; Sun, 22 Jan 2023 10:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30MAlnn5072278; Sun, 22 Jan 2023 10:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30MAlnns072277; Sun, 22 Jan 2023 10:47:49 GMT (envelope-from git) Date: Sun, 22 Jan 2023 10:47:49 GMT Message-Id: <202301221047.30MAlnns072277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yoshihiro Takahashi Subject: git: a73118389b4c - stable/13 - unzip: Document optional member list List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a73118389b4c776fb70b2d26c7a4b9d05df2e8b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=a73118389b4c776fb70b2d26c7a4b9d05df2e8b8 commit a73118389b4c776fb70b2d26c7a4b9d05df2e8b8 Author: Yoshihiro Takahashi AuthorDate: 2023-01-02 04:17:27 +0000 Commit: Yoshihiro Takahashi CommitDate: 2023-01-22 10:45:46 +0000 unzip: Document optional member list Submitted by: Pat Maddox (man page) PR: 267426 (cherry picked from commit a1f28ec729f7491da8607e8eeaee1b0f547c60d0) --- usr.bin/unzip/unzip.1 | 8 +++++++- usr.bin/unzip/unzip.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/usr.bin/unzip/unzip.1 b/usr.bin/unzip/unzip.1 index bb43abf43a85..82e2c3a60ea0 100644 --- a/usr.bin/unzip/unzip.1 +++ b/usr.bin/unzip/unzip.1 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 25, 2021 +.Dd January 2, 2023 .Dt UNZIP 1 .Os .Sh NAME @@ -38,6 +38,7 @@ .Op Fl x Ar pattern .Op Fl P Ar password .Ar zipfile +.Op Ar member ... .Sh DESCRIPTION .\" ... The following options are available: @@ -120,6 +121,11 @@ mode changes the way in which additional arguments are parsed. Currently only .Xr zipinfo 1L mode 1 is supported, which lists the file names one per line. +.It Ar [member ...] +Optional list of members to extract from the zipfile. +Can include patterns, e.g. +.Ar 'memberdir/*' +will extract all files and dirs below memberdir. .El .Pp Note that only one of diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c index 0b564b0f08ec..78731555eadc 100644 --- a/usr.bin/unzip/unzip.c +++ b/usr.bin/unzip/unzip.c @@ -998,8 +998,9 @@ static void usage(void) { - fprintf(stderr, "Usage: unzip [-aCcfjLlnopqtuvyZ1] [-d dir] " - "[-x pattern] [-P password] zipfile\n"); + fprintf(stderr, +"Usage: unzip [-aCcfjLlnopqtuvyZ1] [-d dir] [-x pattern] [-P password] zipfile\n" +" [member ...]\n"); exit(EXIT_FAILURE); }