Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Print help to stdout

Browse source 
The output of -h/--help was printed on stderr, although it is not an
error.

Printing on stdout allows to pipe the result directly:

    scrcpy --help | less

Instead of (in bash):

    scrcpy --help |& less
This commit is contained in:
Romain Vimont 2021-11-19 08:15:20 +01:00
parent 4cfc1cd70a
commit b25404ee4b
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/cli.c
View file

@ -675,12 +675,12 @@ print_option_usage_header(const struct sc_option *opt) {
} }
} }
fprintf(stderr, "\n %s\n", buf.s); printf("\n %s\n", buf.s);
free(buf.s); free(buf.s);
return; return;
error: error:
fprintf(stderr, "<ERROR>\n"); printf("<ERROR>\n");
} }
static void static void
@ -696,11 +696,11 @@ print_option_usage(const struct sc_option *opt, unsigned cols) {
char *text = sc_str_wrap_lines(opt->text, cols, 8); char *text = sc_str_wrap_lines(opt->text, cols, 8);
if (!text) { if (!text) {
fprintf(stderr, "<ERROR>\n"); printf("<ERROR>\n");
return; return;
} }
fprintf(stderr, "%s\n", text); printf("%s\n", text);
free(text); free(text);
} }
@ -711,11 +711,11 @@ print_shortcuts_intro(unsigned cols) {
"(left) Alt or (left) Super, but it can be configured by " "(left) Alt or (left) Super, but it can be configured by "
"--shortcut-mod (see above).", cols, 4); "--shortcut-mod (see above).", cols, 4);
if (!intro) { if (!intro) {
fprintf(stderr, "<ERROR>\n"); printf("<ERROR>\n");
return; return;
} }
fprintf(stderr, "%s\n", intro); printf("%s\n", intro);
free(intro); free(intro);
} }
@ -725,21 +725,21 @@ print_shortcut(const struct sc_shortcut *shortcut, unsigned cols) {
assert(shortcut->shortcuts[0]); // At least one shortcut assert(shortcut->shortcuts[0]); // At least one shortcut
assert(shortcut->text); assert(shortcut->text);
fprintf(stderr, "\n"); printf("\n");
unsigned i = 0; unsigned i = 0;
while (shortcut->shortcuts[i]) { while (shortcut->shortcuts[i]) {
fprintf(stderr, " %s\n", shortcut->shortcuts[i]); printf(" %s\n", shortcut->shortcuts[i]);
++i; ++i;
}; };
char *text = sc_str_wrap_lines(shortcut->text, cols, 8); char *text = sc_str_wrap_lines(shortcut->text, cols, 8);
if (!text) { if (!text) {
fprintf(stderr, "<ERROR>\n"); printf("<ERROR>\n");
return; return;
} }
fprintf(stderr, "%s\n", text); printf("%s\n", text);
free(text); free(text);
} }
@ -763,14 +763,14 @@ scrcpy_print_usage(const char *arg0) {
} }
} }
fprintf(stderr, "Usage: %s [options]\n\n" printf("Usage: %s [options]\n\n"
"Options:\n", arg0); "Options:\n", arg0);
for (size_t i = 0; i < ARRAY_LEN(options); ++i) { for (size_t i = 0; i < ARRAY_LEN(options); ++i) {
print_option_usage(&options[i], cols); print_option_usage(&options[i], cols);
} }
// Print shortcuts section // Print shortcuts section
fprintf(stderr, "\nShortcuts:\n\n"); printf("\nShortcuts:\n\n");
print_shortcuts_intro(cols); print_shortcuts_intro(cols);
for (size_t i = 0; i < ARRAY_LEN(shortcuts); ++i) { for (size_t i = 0; i < ARRAY_LEN(shortcuts); ++i) {
print_shortcut(&shortcuts[i], cols); print_shortcut(&shortcuts[i], cols);