Merge 1.10.2 patch to stable#52
Merged
RobSanders merged 25 commits intostablefrom Sep 24, 2019
Merged
Conversation
sync w/upsteam
… additional optargs
…LI_CMD_OPTION_MULTIPLE' flag set
All help lines consist of the name and helpstr. This treats allows each
line to be 'wrapped' and collimated so each partial piece of helpstr will
be left aligned with each other. Wrapping is done assuming an 80 col width,
and if a line is wrapped it will attempt to split it at the last white
space in that segment. If none found, then it prints what it can. Then it
also breaks at the first '\n' or '\r'.
Additionally, for optarg help, we can have 'specific' help messages in
addition to the general help for the optarg. Look at the clitest program
for an example (both 'triangle' and 'rectangle' have specific help msgs
for the 'shape' optarg. These specific help messages are tab ('\t')
separated and occur after the general help message. A specific message
will only be shown if 'could' be a match.
Patch against libcli 1 10 0 rel2
Rework slightly extended help - new comand for cleaner use
Patch against libcli 1 10 0 rel2
…r/validator, fix help messages for buildmode, and add dynamic help for buildmode unset
…uires API change to cli_register_optarg() and cli_optarg_addhelp() Problem is that an optarg can be added multiple times but with different modes, but the addhelp only search for the first occurrance of this optarg and added all help features there. Fix is to change the apis for cli_register_optarg() and cli_option_addhelp() - cli_register_optarg() now returns a 'cli_optarg *' instead of an int - cli_optarg_addhelp() now called with (struct cli_optarg *, const char *helpname, const char *helptext)
- In order to have cli_optarg_addhelp() add the extra help text to the right optarg, the return value of cli_register_optarg() was changed from an int to a 'struct optarg *'
delete-merged-branch
Bot
deleted the
patch_against_libcli_1_10_0_rel2
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge patch_against_libcli_1_10_0_rel2 into stable.
Branch was misnamed originally, but will be the 1.10.2 (release 1) branch when tagged.