From eded33173b275b08277811c6b7bbb6dcd4949975 Mon Sep 17 00:00:00 2001 From: Simon Matter Date: Wed, 21 Feb 2018 23:49:55 +0100 Subject: nxagent: Print correct application in usage message. Fixes ArcticaProject/nx-libs#639. --- nx-X11/programs/Xserver/os/utils.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nx-X11/programs/Xserver/os/utils.c') diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 0ebb64487..01666326e 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -556,7 +556,12 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay) void UseMsg(void) { +#ifdef NXAGENT_SERVER + extern const char *__progname; + ErrorF("Usage: %s [] [:]\n\n", __progname); +#else ErrorF("use: X [:] [option]\n"); +#endif ErrorF("-a # mouse acceleration (pixels)\n"); ErrorF("-ac disable access control restrictions\n"); #ifdef MEMBUG -- cgit v1.2.3 From 0371276fb4030261878dd6cfced9abd7bcd6137f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 26 Feb 2018 12:50:12 +0100 Subject: hw/nxagent/: Stop using non-portable '__progname', set up our own 'nxagentProgName' instead and pass it around where needed. --- nx-X11/programs/Xserver/os/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/os/utils.c') diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 01666326e..a8155f3b4 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -557,8 +557,8 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay) void UseMsg(void) { #ifdef NXAGENT_SERVER - extern const char *__progname; - ErrorF("Usage: %s [] [:]\n\n", __progname); + extern const char *nxagentProgName; + ErrorF("Usage: %s [] [:]\n\n", nxagentProgName); #else ErrorF("use: X [:] [option]\n"); #endif -- cgit v1.2.3