diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2016-10-16 00:44:30 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2016-10-16 00:55:09 +0300 |
| commit | ee71e7712297f5e2ca6ed38fce4a0fc1e72ca5d0 (patch) | |
| tree | 3ae2e8c37668fb8a7d2b4bab1c4fa43da675d4db /libmailutils/tests/.gitignore | |
| parent | 2a28ab58762f9ae9cd00ca3e467ee6f90f241201 (diff) | |
| download | mailutils-ee71e7712297f5e2ca6ed38fce4a0fc1e72ca5d0.tar.gz mailutils-ee71e7712297f5e2ca6ed38fce4a0fc1e72ca5d0.tar.bz2 | |
Allow for multiple argument sets in help output.
Alternative invocations follow the main one, each on a separate line,
preceded by " or: ".
* include/mailutils/cli.h (mu_cli_setup) <prog_alt_args>: New member.
* include/mailutils/opt.h (mu_parseopt) <po_prog_args>: Change type.
(mu_program_usage): Change signature.
* include/mailutils/stream.h (MU_IOCTL_WORDWRAP_GET_OFFSET): Rename to
MU_IOCTL_WORDWRAP_GET_COLUMN. All uses changed.
* libmailutils/cli/cli.c (mu_cli): Construct po.po_prog_args from
prog_args and prog_alt_args.
* libmailutils/opt/help.c (move_margin): Remove.
(print_program_usage): New static function.
(mu_program_usage): Second argument instructs how to display options.
Main work is done by print_program_usage.
(mu_program_help): Call print_program_usage.
* libmailutils/opt/opt.c: Update.
* libmailutils/stream/wordwrap.c (set_margin): Avoid unnecessary flushes.
* libmailutils/tests/parseopt.c (MU_PARSEOPT_PROG_ARGS): Alternative
argument sets are separated by the pipe sign.
* libmailutils/tests/Makefile.am: Add new testcase.
* libmailutils/tests/testsuite.at: Likewise.
* libmailutils/tests/parseopt_help04.at: Add MU_PARSEOPT_PROG_ARGS
to keywords.
* libmailutils/tests/parseopt_help12.at: New file.
* libmailutils/tests/tcli.c (cli): Add alternative arguments.
* dotlock/dotlock.c: Update.
* mimeview/mimeview.c: Likewise.
* sieve/sieve.c: Likewise.
Diffstat (limited to 'libmailutils/tests/.gitignore')
| -rw-r--r-- | libmailutils/tests/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmailutils/tests/.gitignore b/libmailutils/tests/.gitignore index 62b06b497..b8c5ee66f 100644 --- a/libmailutils/tests/.gitignore +++ b/libmailutils/tests/.gitignore @@ -18,6 +18,7 @@ imapio listop mailcap mimehdr +modmesg modtofsaf msgset parseopt @@ -32,4 +33,5 @@ tempfile url-comp url-parse wicket +wordwrap wsp |