aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorSimon Matter <simon.matter@invoca.ch>2018-02-21 23:39:23 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-02-26 11:52:47 +0100
commit7c32938ac5b803a1630920dd027be33df07aa3df (patch)
tree52721488fd22f4d8c124fadf3cc4170767aae807 /nx-X11/programs
parent751760421f6644c22e30baa6ee8e791642d6a04d (diff)
downloadnx-libs-7c32938ac5b803a1630920dd027be33df07aa3df.tar.gz
nx-libs-7c32938ac5b803a1630920dd027be33df07aa3df.tar.bz2
nx-libs-7c32938ac5b803a1630920dd027be33df07aa3df.zip
nxagent: Add -version cmdline option.
Fixes ArcticaProject/nx-libs#653.
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c11
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c5
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.13
4 files changed, 17 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 604b33187..1a43f3797 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -336,6 +336,12 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 0;
}
+ if (!strcmp(argv[i], "-version"))
+ {
+ nxagentShowVersionInfo();
+ exit(0);
+ }
+
/*
* This had to be '-options' since the beginning
* but was '-option' by mistake. Now we have to
@@ -2112,6 +2118,7 @@ void ddxUseMsg()
ErrorF("-R enable rootless mode\n");
ErrorF("-S enable shadow mode\n");
ErrorF("-B enable proxy binding mode\n");
+ ErrorF("-version show version information and exit\n");
}
static int nxagentGetDialogName()
@@ -2609,3 +2616,7 @@ void nxagentSetCoalescence()
nxagentChangeOption(DisplayCoalescence, timeout);
}
+void nxagentShowVersionInfo(void)
+{
+ ErrorF("NXAGENT - Version " NX_VERSION_CURRENT_STRING "\n");
+}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h
index a3f7e349b..8d6f29b06 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
@@ -96,6 +96,8 @@ void nxagentSetBufferSize(void);
void nxagentSetScheduler(void);
void nxagentSetCoalescence(void);
+void nxagentShowVersionInfo(void);
+
extern int nxagentUserDefinedFontPath;
extern int nxagentRemoteMajor;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index a35e3d5a8..17c430d2b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -85,9 +85,6 @@ is" without express or implied warranty.
#undef DEBUG
#undef DUMP
-#define NXAGENT_VERSION NX_VERSION_CURRENT
-#define NXAGENT_VERSION_STRING NX_VERSION_CURRENT_STRING
-
/*
* ProcVector array defined in tables.c.
*/
@@ -234,7 +231,7 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
if (serverGeneration <= 1)
{
- fprintf(stderr, "\nNXAGENT - Version " NXAGENT_VERSION_STRING "\n\n");
+ fprintf(stderr, "\nNXAGENT - Version " NX_VERSION_CURRENT_STRING "\n\n");
fprintf(stderr, "Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n");
fprintf(stderr, "Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n");
fprintf(stderr, "Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index d06cb8495..f4a9fa4f1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -449,6 +449,9 @@ enable shadow mode
.B \-B
enable proxy binding mode
.TP 8
+.B \-version
+show version information and exit
+.TP 8
.B \-options \fIfilename\fP
path to an options file containing nx/nx options (see below).
.PP