git: a8e8a9144568 - main - pax: name all supported formats.

The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=a8e8a914456878a67dfc5ef6f917a04be2e6a0c7

commit a8e8a914456878a67dfc5ef6f917a04be2e6a0c7
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2022-09-13 16:12:57 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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()