From e4338c8ab38154f5508111e67ea72dc1d37d8a4f Mon Sep 17 00:00:00 2001 From: midipix Date: Tue, 28 May 2024 14:15:26 +0000 Subject: driver: posix conformance: replace long options with -Warg[=val] notation. --- src/skin/tpax_skin_default.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/skin/tpax_skin_default.c b/src/skin/tpax_skin_default.c index 68491df..1db63c8 100644 --- a/src/skin/tpax_skin_default.c +++ b/src/skin/tpax_skin_default.c @@ -3,31 +3,39 @@ #include "argv/argv.h" const tpax_hidden struct argv_option tpax_default_options[] = { - {"version", 0,TAG_VERSION,ARGV_OPTARG_NONE,0,0,0, + {"Wversion", 0,TAG_VERSION,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "show version information"}, - {"help", 0,TAG_HELP,ARGV_OPTARG_OPTIONAL,0,"short|long",0, - "show usage information [listing %s options only]"}, + {"Whelp", 0,TAG_HELP,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, + "show usage information"}, - {"list", 0,TAG_LIST,ARGV_OPTARG_NONE,0,0,0, + {"Wlist", 0,TAG_LIST,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "list mode (output names of archive members)"}, - {"read", 'r',TAG_READ,ARGV_OPTARG_NONE,0,0,0, + {"Wread", 'r',TAG_READ,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "read mode (extract matching archive members)"}, - {"write", 'w',TAG_WRITE,ARGV_OPTARG_NONE,0,0,0, + {"Write", 'w',TAG_WRITE,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "write mode (add specified files to archive)"}, - {"copy", 0,TAG_COPY,ARGV_OPTARG_NONE,0,0,0, + {"Wcopy", 0,TAG_COPY,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "copy mode (copy specified files " "to a specified destination directory)"}, - {"format", 'x',TAG_FORMAT,ARGV_OPTARG_REQUIRED,0, + {"Wformat", 'x',TAG_FORMAT,ARGV_OPTARG_REQUIRED, + ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_EQUAL, "pax|cpio|ustar|rustar",0, "archive format [%s]"}, - {"blksize", 'b',TAG_BLKSIZE,ARGV_OPTARG_REQUIRED,0,0,0, + {"Wblksize", 'b',TAG_BLKSIZE,ARGV_OPTARG_REQUIRED, + ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_EQUAL,0,0, "(non-default) block-size; valid values are " "in the range of 512 to 32256; keeping " "the default format-specific block size " @@ -35,20 +43,24 @@ const tpax_hidden struct argv_option tpax_default_options[] = { " 10240 for the ustar format) " "is strongly recommended."}, - {"recurse", 0,TAG_RECURSE,ARGV_OPTARG_NONE,0,0,0, + {"Wrecurse", 0,TAG_RECURSE,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "recurse into directory archive members " "(this is the tpax_main() default)"}, - {"no-recurse", 'd',TAG_NORECURSE,ARGV_OPTARG_NONE,0,0,0, + {"Wno-recurse",'d',TAG_NORECURSE,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "do not recurse into directory archive members"}, - {"strict-path-input", - 0,TAG_STRICT_PATH,ARGV_OPTARG_NONE,0,0,0, + {"Wstrict-path-input", + 0,TAG_STRICT_PATH,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "do not allow file arguments (in write and copy modes) " "to contain parent-directoy (dot dot) references"}, - {"pure-path-output", - 0,TAG_PURE_PATH,ARGV_OPTARG_NONE,0,0,0, + {"Wpure-path-output", + 0,TAG_PURE_PATH,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, "output (in list mode) or store (in write mode) path " "names in pure form, specifically by liminating all " "this-dir (dot) elements from the listed/stored path " -- cgit v1.2.3