diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2017-03-15 15:05:18 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-21 10:58:08 +0100 |
| commit | 3be144ffde5f35df21ad115cbdedb8a072420edb (patch) | |
| tree | 7e287ed4fc9517dd86811c2f431a369aa7f9fe47 /nx-X11/programs/Xserver/os/utils.c | |
| parent | 506aedbcd3f56cf255b397f1e586f16f97e3619a (diff) | |
| download | nx-libs-3be144ffde5f35df21ad115cbdedb8a072420edb.tar.gz nx-libs-3be144ffde5f35df21ad115cbdedb8a072420edb.tar.bz2 nx-libs-3be144ffde5f35df21ad115cbdedb8a072420edb.zip | |
Handle -displayfd and an explicit display number sensibly
commit bc348bd2c42f3f18786085ccef2f010eff5bf3d2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 11 14:34:32 2013 +0000
Handle -displayfd and an explicit display number sensibly
Handle -displayfd and an explicit display number sensibly, e.g. use the
explicitly specified display number, and write it to the displayfd
v2: displayfd might be 0, so use -1 as invalid value
v3: Rebase for addition of NoListenAll flag
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/os/utils.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index dce04e942..6995d05d5 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -704,6 +704,7 @@ ProcessCommandLine(int argc, char *argv[]) { /* initialize display */ display = argv[i]; + explicit_display = TRUE; display++; if( ! VerifyDisplayName( display ) ) { ErrorF("Bad display name: %s\n", display); @@ -783,7 +784,6 @@ ProcessCommandLine(int argc, char *argv[]) else if (strcmp(argv[i], "-displayfd") == 0) { if (++i < argc) { displayfd = atoi(argv[i]); - display = NULL; nolock = TRUE; } else |