summaryrefslogtreecommitdiff
path: root/x11/x11vnc/patches/patch-x11vnc_unixpw.c
blob: 52ec58c506cc511a6467c2d51c61784eb7c7d61f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
$NetBSD: patch-x11vnc_unixpw.c,v 1.1 2013/11/02 07:32:28 obache Exp $

* Use openpty(3) if available

--- x11vnc/unixpw.c.orig	2011-08-10 22:31:32.000000000 +0000
+++ x11vnc/unixpw.c
@@ -92,6 +92,18 @@ extern char *crypt(const char*, const ch
 #define IS_BSD
 #endif
 
+#if LIBVNCSERVER_HAVE_OPENPTY
+#if LIBVNCSERVER_HAVE_UTIL_H
+#include <util.h>
+#endif
+#if LIBVNCSERVER_HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
+#if LIBVNCSERVER_HAVE_PTY_H
+#include <pty.h>
+#endif
+#endif
+
 int white_pixel(void);
 void unixpw_screen(int init);
 void unixpw_keystroke(rfbBool down, rfbKeySym keysym, int init);
@@ -581,6 +593,23 @@ char *get_pty_ptmx(int *fd_p) {
 #endif /* GRANTPT */
 }
 
+#if LIBVNCSERVER_HAVE_OPENPTY
+char *get_pty_openpty(int *fd_p) {
+	int fd, sfd;
+
+	*fd_p = -1;
+
+	if (openpty(&fd, &sfd, slave_str, NULL, NULL) < 0) {
+		return NULL;
+	}
+
+#if LIBVNCSERVER_HAVE_SYS_IOCTL_H && defined(TIOCFLUSH)
+	ioctl(fd, TIOCFLUSH, (char *) 0);
+#endif
+	*fd_p = fd;
+	return slave_str;
+}
+#endif
 
 char *get_pty_loop(int *fd_p) {
 	char master_str[16];
@@ -625,6 +654,9 @@ char *get_pty(int *fd_p) {
 	if (getenv("BSD_PTY")) {
 		return get_pty_loop(fd_p);
 	}
+#if LIBVNCSERVER_HAVE_OPENPTY
+	return get_pty_openpty(fd_p);
+#else
 #ifdef IS_BSD
 	return get_pty_loop(fd_p);
 #else
@@ -635,6 +667,7 @@ char *get_pty(int *fd_p) {
 	return get_pty_loop(fd_p);
 #endif
 #endif
+#endif
 }
 
 void try_to_be_nobody(void) {