alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

console: argtable3: re-introduce arg_print_formatted function

Browse Source
This commit is contained in:
Ivan Grokhotkov 2022-04-05 19:55:40 +02:00
parent 21a94dfcb6
commit 8240144580
No known key found for this signature in database
GPG Key ID: 1E050E141B280628
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
components/console/argtable3/argtable3.c
View File

@ -869,31 +869,7 @@ void arg_print_glossary(FILE* fp, void** argtable, const char* format) {
* to right margin. The function does not indent the first line, but
* only the following ones.
*
* Example:
* arg_print_formatted( fp, 0, 5, "Some text that doesn't fit." )
* will result in the following output:
*
* Some
* text
* that
* doesn'
* t fit.
*
* Too long lines will be wrapped in the middle of a word.
*
* arg_print_formatted( fp, 2, 7, "Some text that doesn't fit." )
* will result in the following output:
*
* Some
* text
* that
* doesn'
* t fit.
*
* As you see, the first line is not indented. This enables output of
* lines, which start in a line where output already happened.
*
* Author: Uli Fouquet
* See description of arg_print_formatted below.
*/
static void arg_print_formatted_ds(arg_dstr_t ds, const unsigned lmargin, const unsigned rmargin, const char* text) {
const unsigned int textlen = (unsigned int)strlen(text);
@ -954,6 +930,45 @@ static void arg_print_formatted_ds(arg_dstr_t ds, const unsigned lmargin, const
} /* lines of text */
}
/**
* Print a piece of text formatted, which means in a column with a
* left and a right margin. The lines are wrapped at whitspaces next
* to right margin. The function does not indent the first line, but
* only the following ones.
*
* Example:
* arg_print_formatted( fp, 0, 5, "Some text that doesn't fit." )
* will result in the following output:
*
* Some
* text
* that
* doesn'
* t fit.
*
* Too long lines will be wrapped in the middle of a word.
*
* arg_print_formatted( fp, 2, 7, "Some text that doesn't fit." )
* will result in the following output:
*
* Some
* text
* that
* doesn'
* t fit.
*
* As you see, the first line is not indented. This enables output of
* lines, which start in a line where output already happened.
*
* Author: Uli Fouquet
*/
void arg_print_formatted(FILE* fp, const unsigned lmargin, const unsigned rmargin, const char* text) {
arg_dstr_t ds = arg_dstr_create();
arg_print_formatted_ds(ds, lmargin, rmargin, text);
fputs(arg_dstr_cstr(ds), fp);
arg_dstr_destroy(ds);
}
/**
* Prints the glossary in strict GNU format.
* Differences to arg_print_glossary() are:

1
components/console/argtable3/argtable3.h
View File

@ -229,6 +229,7 @@ ARG_EXTERN void arg_print_syntax(FILE* fp, void** argtable, const char* suffix);
ARG_EXTERN void arg_print_syntaxv(FILE* fp, void** argtable, const char* suffix);
ARG_EXTERN void arg_print_glossary(FILE* fp, void** argtable, const char* format);
ARG_EXTERN void arg_print_glossary_gnu(FILE* fp, void** argtable);
ARG_EXTERN void arg_print_formatted(FILE *fp, const unsigned lmargin, const unsigned rmargin, const char *text);
ARG_EXTERN void arg_print_errors(FILE* fp, struct arg_end* end, const char* progname);
ARG_EXTERN void arg_print_option_ds(arg_dstr_t ds, const char* shortopts, const char* longopts, const char* datatype, const char* suffix);
ARG_EXTERN void arg_print_syntax_ds(arg_dstr_t ds, void** argtable, const char* suffix);