diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-02-27 23:00:08 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 01:03:19 +0100 |
| commit | 809206d0cf79f367d852f180f1a5733420010689 (patch) | |
| tree | 89015a452f1fa8488b0db6dda72244f1478d7874 | |
| parent | 9822e9703370980fa86906d7ffd63d62e7e2bc53 (diff) | |
| download | nx-libs-809206d0cf79f367d852f180f1a5733420010689.tar.gz nx-libs-809206d0cf79f367d852f180f1a5733420010689.tar.bz2 nx-libs-809206d0cf79f367d852f180f1a5733420010689.zip | |
os: hide ttyxx option
is used nowhere anyway
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 3 | ||||
| -rw-r--r-- | 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 e860857b7..995576b5c 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 2edd8dd3f..0a1e3f7b2 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) { |