frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xf86OpenSerial: Add support server managed fds 

Try to get a server managed fd from the Options before trying to open the
device node ourselves.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Hans de Goede 2014-02-01 13:21:15 +01:00
parent d9a4059d40
commit bf3543739d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/os-support/shared/posix_tty.c
View File

@ -124,7 +124,11 @@ xf86OpenSerial(XF86OptionPtr options)
return -1; return -1;
} }
SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK)); fd = xf86CheckIntOption(options, "fd", -1);
if (fd == -1)
SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
if (fd == -1) { if (fd == -1) {
xf86Msg(X_ERROR, xf86Msg(X_ERROR,
"xf86OpenSerial: Cannot open device %s\n\t%s.\n", "xf86OpenSerial: Cannot open device %s\n\t%s.\n",