compositor: print usage to stdout on success (not stderr) - this time really
Fix all the other printfs too.
https://gitlab.freedesktop.org/wayland/weston/issues/112
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/compositor/main.c b/compositor/main.c
index 93f92fd..86e3782 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -438,7 +438,9 @@
static int
usage(int error_code)
{
- fprintf(error_code == EXIT_SUCCESS ? stdout : stderr,
+ FILE *out = error_code == EXIT_SUCCESS ? stdout : stderr;
+
+ fprintf(out,
"Usage: weston [OPTIONS]\n\n"
"This is weston version " VERSION ", the Wayland reference compositor.\n"
"Weston supports multiple backends, and depending on which backend is in use\n"
@@ -478,7 +480,7 @@
" -h, --help\t\tThis help message\n\n");
#if defined(BUILD_DRM_COMPOSITOR)
- fprintf(stderr,
+ fprintf(out,
"Options for drm-backend.so:\n\n"
" --seat=SEAT\t\tThe seat that weston should run on\n"
" --tty=TTY\t\tThe tty to use\n"
@@ -488,7 +490,7 @@
#endif
#if defined(BUILD_FBDEV_COMPOSITOR)
- fprintf(stderr,
+ fprintf(out,
"Options for fbdev-backend.so:\n\n"
" --tty=TTY\t\tThe tty to use\n"
" --device=DEVICE\tThe framebuffer device to use\n"
@@ -496,7 +498,7 @@
#endif
#if defined(BUILD_HEADLESS_COMPOSITOR)
- fprintf(stderr,
+ fprintf(out,
"Options for headless-backend.so:\n\n"
" --width=WIDTH\t\tWidth of memory surface\n"
" --height=HEIGHT\tHeight of memory surface\n"
@@ -508,7 +510,7 @@
#endif
#if defined(BUILD_RDP_COMPOSITOR)
- fprintf(stderr,
+ fprintf(out,
"Options for rdp-backend.so:\n\n"
" --width=WIDTH\t\tWidth of desktop\n"
" --height=HEIGHT\tHeight of desktop\n"
@@ -523,7 +525,7 @@
#endif
#if defined(BUILD_WAYLAND_COMPOSITOR)
- fprintf(stderr,
+ fprintf(out,
"Options for wayland-backend.so:\n\n"
" --width=WIDTH\t\tWidth of Wayland surface\n"
" --height=HEIGHT\tHeight of Wayland surface\n"
@@ -536,7 +538,7 @@
#endif
#if defined(BUILD_X11_COMPOSITOR)
- fprintf(stderr,
+ fprintf(out,
"Options for x11-backend.so:\n\n"
" --width=WIDTH\t\tWidth of X window\n"
" --height=HEIGHT\tHeight of X window\n"
