From nobody Sun Jan 22 10:49:17 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 4P093143jwz32J7X; Sun, 22 Jan 2023 10:49:17 +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 4P09313TXdz3pJx; Sun, 22 Jan 2023 10:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674384557; 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=NyCPyJG3CL/mziARiWuzaT9/2Q/iOaoHTFo0zZnYAWU=; b=N16hN0pjUDUyb1bgrG4GFSDEnypwic40rOaFIkO7faI6Dgr6+7SK8Jqrtrf59R0Lcq9HV6 6ZdzTCkAe/GA2ygugEjGtRa3eQFI1iSU3XMPNdv3vuhlPlkIv++qJwXgXRULLmSz+Z0jAO L4S3oVMClU/T9yc1wFupAMsIQCWngPHn9JHyaoyFAjRgcex6u8cYpLIcwCG+dggvGhyMXT 8XLTicHX6g1NtI1VsyMjMGdLlMSGZ/qhKBS2SIda4PtAkN/91ySusNaZzju7aAtz8wpeU7 X5L/xQ2x7xQhc05CHFS+AJLsZK8BByQQ/JGeTX+lObsq8q8lKF/ALSdUF2lV8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674384557; 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=NyCPyJG3CL/mziARiWuzaT9/2Q/iOaoHTFo0zZnYAWU=; b=LmZPDw9O0Km7gEBd79SS3NhNmMeA8hRFiddn5uXWTfqFhwGMgbtc/WYtPzswIgABklpI5G 9aCibUzFBHvzIysWulBQyCJrwdysKcMuX11H5HYCqpQHDRM5s0YxWcBZxWBmuOAlt5yenT cwPhRMWK0Y/+VTm1FBGMGX44UI2OxBsyqMIb0wRfx1e1h5KmcYCZQ6kMol9vr7lT4BoYiW vM67whNrq0DTbcL4ixMKsZXco9EyGqH5brZOdPvub8zeApt6cU2+iu8EiViJ+dVVZhIveN M/n0KJqNkSn48+a5uVnZ5mJouhxTPy8Ykw1RstNQc1qVdJwtG7GiQLEaSCOtzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674384557; a=rsa-sha256; cv=none; b=AmM6kVQnJ72H6iKA1n8iLsrsUmJEI2RTbnDTL1zdFrMGqKxaV9UyJAIQrsZuZaU3pT/T1T 1JwCEjPsrih0Sbf8EDaD+p8f2Sw/M0Peu63+IIFEBLYNbR6C3kz+yeDwq9YAFir3i4D9uZ rM38IUTo7s8QNmgK3TA6kAYMyItkClEaCsObkTyOVlY0RU1D1224lhM/cHqtAjXpwBdvHE xre1X15uhuo82RIxlgizxuVhhoFPfH/uGpobkyOzX5E/OpXP/Rl2tUDqWw0thYUD26h4fX 5W1UNsSxWHPgdBTzVH/qtDxyREVvXiDZBkqPhwme4qEu7W6MBR7tn5dTfd/e2Q== 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 4P09312WD6zmWQ; Sun, 22 Jan 2023 10:49:17 +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 30MAnHN7072564; Sun, 22 Jan 2023 10:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30MAnHCr072563; Sun, 22 Jan 2023 10:49:17 GMT (envelope-from git) Date: Sun, 22 Jan 2023 10:49:17 GMT Message-Id: <202301221049.30MAnHCr072563@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: 9c9e31b9ac7b - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 9c9e31b9ac7ba6dd7078aeae5ec4b119c651efc9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=9c9e31b9ac7ba6dd7078aeae5ec4b119c651efc9 commit 9c9e31b9ac7ba6dd7078aeae5ec4b119c651efc9 Author: Yoshihiro Takahashi AuthorDate: 2023-01-02 04:17:27 +0000 Commit: Yoshihiro Takahashi CommitDate: 2023-01-22 10:48:17 +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); }