os: FatalError if -displayfd writes fail AND Clear the -displayfd option after closing the file

commit d72f691c0c9cace857975a6608a4cb431c8b6846 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 18 15:00:30 2014 -0700 os: FatalError if -displayfd writes fail When the server is started with the -displayfd option, check to make sure that the writes succeed and give up running if they don't. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> commit 4957e986841225e9984daca76f1a0ee08df125bb Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 18 15:00:35 2014 -0700 os: Clear the -displayfd option after closing the file Failing to clear this means that we'll attempt to write the display number to a random file descriptor on subsequent X server generations. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

os: FatalError if -displayfd writes fail AND Clear the -displayfd option after closing the file
a95cfdf4 · Keith Packard · Mike Gabriel · e96e810c · a95cfdf4
Commit a95cfdf4 authored Mar 15, 2017 by Keith Packard Committed by Mike Gabriel Mar 21, 2017
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

connection.c nx-X11/programs/Xserver/os/connection.c +5 -1

No files found.
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -364,8 +364,12 @@ NotifyParentProcess(void)
 {
 #if !defined(WIN32)
    if (displayfd >= 0) {
-        write(displayfd, display, strlen(display));
+	if (write(displayfd, display, strlen(display)) != strlen(display))
+	    FatalError("Cannot write display number to fd %d\n", displayfd);
+	if (write(displayfd, "\n", 1) != 1)
+	    FatalError("Cannot write display number to fd %d\n", displayfd);
 	close(displayfd);
+	displayfd = -1;
    }
    if (RunFromSmartParent) {
       if (ParentProcess > 1) {