From nobody Tue Sep 13 16:13:46 2022 X-Original-To: dev-commits-src-all@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 4MRpRt3cKpz4blvn; Tue, 13 Sep 2022 16:13:46 +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 4MRpRt32Ypz3C37; Tue, 13 Sep 2022 16:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663085626; 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=eDtT5DMEV+c4l5JTeRb5qEKBdnz5Tx4IZoHVbx3lWnA=; b=hCqZkrEjRDkWyeMQmY5W4Hbt9Q4ltRmCDRNu1cYtUSSuRqi8cGKKyAo7FPgP5QmxflNbHt mBzlrPprz4nD/NPuf1VWLyJxHYpnFBDJLkIW/5YvgCcO5V9IMmfpuXIi33FYCagkFAjclK agO90DgKc9D1/2OEoSQeqppYpdxvOmwoxJQRwSnM6pFOrXJ5IyGJMbzm8siEyCSJTI2gR5 LfBpS+dsQ8j/ezEin9xWf07v2xl7uE0tVyigE6JMAljAUMhIDVBwvfFlPmeQNCOXoy/NTi qtKQ6M2+iLA8RA0wCcf9QlrV6lcZbCh7+oKhygGMgeHE4IXFxaf1BXILBSLUMA== 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 4MRpRt23y3zNmQ; Tue, 13 Sep 2022 16:13:46 +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 28DGDkMR046789; Tue, 13 Sep 2022 16:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DGDkwX046788; Tue, 13 Sep 2022 16:13:46 GMT (envelope-from git) Date: Tue, 13 Sep 2022 16:13:46 GMT Message-Id: <202209131613.28DGDkwX046788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: a8e8a9144568 - main - pax: name all supported formats. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8e8a914456878a67dfc5ef6f917a04be2e6a0c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663085626; 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=eDtT5DMEV+c4l5JTeRb5qEKBdnz5Tx4IZoHVbx3lWnA=; b=OsjhX5ULoUTt7j0MzNHQ2iqyyuu91rjULJSBW+wLJunIArpG5MDH+DqgvYcbEirKAXj5Wf sMfRrTEmqOSNylVCRqMQ2Ymag1ICxMPtN2JyLinmSL+VM/r57fLN++GeN9o+fUualKXg2O WTn5t6vzFD8uzeALvLZWA8BiOhtYzFVifqXBE6tStSrVuTyYfppiNDd8wAEpEFklM+f9ES h58S7FFw2+NeWNXCamj6ywXRZAqbMX0bKb+E1uFw04gGoaeNHvHQmJc3Z3zBhcZVG+ITlv nyycLwdnQBwvt5+KTAwlLRjFFMwtS0aBOSisrfjMrXicy5WmUPamKDqngJ+zIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663085626; a=rsa-sha256; cv=none; b=jUewgeNeHZiFX5J9K2WPp8D/aBoQsWDwBNp6BzS3j3O6FJUP7TP3FjK86q41fUTlGXM2yy o9Iy5W0HawdPGriJYFI/ctoZSULnYTNPz5IiHDUTEJd8QuD9hEl6ovcSxTi29RrDrc7E5x S1w/f3FLALU6jvL6MsK1DH18QNWhGEdeElUQUhilt+sQOGs8rRSwT32UXIBkoSPmcnMN70 8DRgXp/PwgSNnQuILtu6/fqhNvyKlYPVdnI22u0wsFsWw9NxhBF6uLEWNxlQnBNNtzwjU3 6TirFF+GLU/VwxQyfihvtZ/yjLGErYzWUKW5V2tkzJaDHoUQ3V3Rlztz63hJlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e8a914456878a67dfc5ef6f917a04be2e6a0c7 commit a8e8a914456878a67dfc5ef6f917a04be2e6a0c7 Author: Dag-Erling Smørgrav AuthorDate: 2022-09-13 16:12:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-09-13 16:13:19 +0000 pax: name all supported formats. Sponsored by: Klara, Inc. --- bin/pax/options.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/pax/options.c b/bin/pax/options.c index 698300087302..1366bb75eef6 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -131,17 +131,18 @@ FSUB fsub[] = { }; #define F_OCPIO 0 /* format when called as cpio -6 */ #define F_ACPIO 1 /* format when called as cpio -c */ +#define F_SCPIO 2 /* format when called with -x sv4cpio */ #define F_CPIO 3 /* format when called as cpio */ #define F_OTAR 4 /* format when called as tar -o */ #define F_TAR 5 /* format when called as tar */ -#define DEFLT 5 /* default write format from list above */ +#define DEFLT F_TAR /* default write format from list above */ /* * ford is the archive search order used by get_arc() to determine what kind * of archive we are dealing with. This helps to properly id archive formats * some formats may be subsets of others.... */ -int ford[] = {5, 4, 3, 2, 1, 0, -1 }; +int ford[] = {F_TAR, F_OTAR, F_CPIO, F_SCPIO, F_ACPIO, F_OCPIO, -1 }; /* * options()