luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio-tool: Print help output to stdout when --help is passed

Browse Source 
If the help output is explicitly requested by the user, it’s
conventional for it to be printed to stdout rather than stderr.

Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
This commit is contained in:
Philip Withnall 2023-11-01 17:04:43 +00:00 committed by Philip Withnall
parent 7c97b93837
commit 96ee1ea086
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gio-tool.c
View File

@ -249,7 +249,7 @@ static const struct
}; };
static void static void
usage (void) usage (gboolean is_error)
{ {
GString *out = NULL; GString *out = NULL;
size_t name_width = 0; size_t name_width = 0;
@ -274,7 +274,10 @@ usage (void)
g_string_append_c (out, '\n'); g_string_append_c (out, '\n');
g_string_append_printf (out, _("Use %s to get detailed help.\n"), "“gio help COMMAND”"); g_string_append_printf (out, _("Use %s to get detailed help.\n"), "“gio help COMMAND”");
g_printerr ("%s", out->str); if (is_error)
g_printerr ("%s", out->str);
else
g_print ("%s", out->str);
g_string_free (out, TRUE); g_string_free (out, TRUE);
} }
@ -306,7 +309,7 @@ main (int argc, char **argv)
if (argc < 2) if (argc < 2)
{ {
usage (); usage (TRUE);
return 1; return 1;
} }
@ -319,7 +322,7 @@ main (int argc, char **argv)
{ {
if (argc == 1) if (argc == 1)
{ {
usage (); usage (FALSE);
return 0; return 0;
} }
else else
@ -330,7 +333,7 @@ main (int argc, char **argv)
} }
else if (g_str_equal (command, "--help")) else if (g_str_equal (command, "--help"))
{ {
usage (); usage (FALSE);
return 0; return 0;
} }
else if (g_str_equal (command, "--version")) else if (g_str_equal (command, "--version"))
@ -347,7 +350,7 @@ main (int argc, char **argv)
} }
/* Unknown subcommand. */ /* Unknown subcommand. */
usage (); usage (TRUE);
return 1; return 1;
} }