[X2Go-Commits] [nx-libs] 05/06: os: hide ttyxx option

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 809206d0cf79f367d852f180f1a5733420010689
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Feb 27 23:00:08 2018 +0100

    os: hide ttyxx option
    
    is used nowhere anyway
---
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 3 ---
 nx-X11/programs/Xserver/os/utils.c               | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index e860857..995576b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -296,9 +296,6 @@ sets default connection timeout in seconds.
 .B \-tst
 disables all testing extensions.
 .TP 8
-.B tty\fIxx\fP
-ignored, for servers started the ancient way (from init).
-.TP 8
 .B v
 sets video-off screen-saver preference.
 .TP 8
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 2edd8dd..0a1e3f7 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -269,7 +269,9 @@ long Memory_fail = 0;
 #include <stdlib.h>  /* for random() */
 #endif
 
+#ifndef NXAGENT_SERVER
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
+#endif
 
 extern char dispatchExceptionAtReset;
 
@@ -628,7 +630,9 @@ void UseMsg(void)
     ErrorF("-terminate             terminate at server reset\n");
     ErrorF("-to #                  connection time out\n");
     ErrorF("-tst                   disable testing extensions\n");
+#ifndef NXAGENT_SERVER
     ErrorF("ttyxx                  server started from init on /dev/ttyxx\n");
+#endif
     ErrorF("v                      video blanking for screen-saver\n");
     ErrorF("-v                     screen-saver without video blanking\n");
     ErrorF("-wm                    WhenMapped default backing-store\n");
@@ -1036,11 +1040,13 @@ ProcessCommandLine(int argc, char *argv[])
 	    /* ignore all remaining arguments */
 	    break;
 	}
+#ifndef NXAGENT_SERVER
 	else if (strncmp (argv[i], "tty", 3) == 0)
 	{
 	    /* just in case any body is interested */
 	    dev_tty_from_init = argv[i];
 	}
+#endif
 #ifdef XDMCP
 	else if ((skip = XdmcpOptions(argc, argv, i)) != i)
 	{

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git