[ViewVC] Diff of: cvs/rxvt-unicode/src/ptytty.C

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.52 by root, Thu Jan 19 20:30:36 2006 UTC

…		…
22	---------------------------------------------------------------------/	22	---------------------------------------------------------------------/
23		23
24	#include "../config.h" /* NECESSARY */	24	#include "../config.h" /* NECESSARY */
25	#include "rxvt.h"	25	#include "rxvt.h"
26		26
27	# include <cstdlib>	27	#include <cstdlib>
28	# include <cstring>	28	#include <cstring>
29		29
30	#ifdef HAVE_SYS_TYPES_H
31	# include <sys/types.h>	30	#include <sys/types.h>
32	#endif	31	#include <sys/socket.h>
33	#ifdef HAVE_UNISTD_H
34	# include <unistd.h>	32	#include <unistd.h>
35	#endif
36	#ifdef HAVE_FCNTL_H
37	# include <fcntl.h>	33	#include <fcntl.h>
38	#endif	34
39	#ifdef HAVE_SYS_IOCTL_H	35	#ifdef HAVE_SYS_IOCTL_H
40	# include <sys/ioctl.h>	36	# include <sys/ioctl.h>
41	#endif	37	#endif
42	#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)	38	#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
43	# include <sys/stropts.h> /* for I_PUSH */	39	# include <sys/stropts.h> /* for I_PUSH */
…		…
53	# include <util.h>	49	# include <util.h>
54	#endif	50	#endif
55		51
56	#include <cstdio>	52	#include <cstdio>
57	#include <grp.h>	53	#include <grp.h>
		54
		55	#include "rxvtutil.h"
		56	#include "fdpass.h"
		57	#include "ptytty.h"
		58
		59	/////////////////////////////////////////////////////////////////////////////
58		60
59	/* ------------------------------------------------------------------------- *	61	/* ------------------------------------------------------------------------- *
60	* GET PSEUDO TELETYPE - MASTER AND SLAVE *	62	* GET PSEUDO TELETYPE - MASTER AND SLAVE *
61	* ------------------------------------------------------------------------- */	63	* ------------------------------------------------------------------------- */
62	/*	64	/*
63	* Returns pty file descriptor, or -1 on failure	65	* Returns pty file descriptor, or -1 on failure
64	* If successful, ttydev is set to the name of the slave device.	66	* If successful, ttydev is set to the name of the slave device.
65	* fd_tty _may_ also be set to an open fd to the slave device	67	* fd_tty _may_ also be set to an open fd to the slave device
66	*/	68	*/
67	static int	69	static inline int
68	get_pty (int fd_tty, char *ttydev)	70	get_pty_streams (int fd_tty, char *ttydev)
69	{	71	{
		72	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
		73	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)
70	int pfd;	74	int pfd;
71		75
		76	# if defined(PTYS_ARE_GETPT)
		77	pfd = getpt();
		78	# elif defined(PTYS_ARE_POSIX)
		79	pfd = posix_openpt (O_RDWR);
		80	# else
		81	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
		82	# endif
		83	if (pfd >= 0)
		84	{
		85	if (grantpt (pfd) == 0 /* change slave permissions */
		86	&& unlockpt (pfd) == 0)
		87	{ /* slave now unlocked */
		88	ttydev = strdup (ptsname (pfd)); / get slave's name */
		89	return pfd;
		90	}
		91
		92	close (pfd);
		93	}
		94	# endif
		95	#endif
		96
		97	return -1;
		98	}
		99
		100	static inline int
		101	get_pty_openpty (int fd_tty, char *ttydev)
		102	{
72	#ifdef PTYS_ARE_OPENPTY	103	#ifdef PTYS_ARE_OPENPTY
73	char tty_name[sizeof "/dev/pts/????\0"];	104	int pfd;
74		105	int res;
75	rxvt_privileges(RESTORE);	106	char tty_name[32];
		107
76	int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);	108	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
77	rxvt_privileges(IGNORE);
78
79	if (res != -1)	109	if (res != -1)
80	{	110	{
81	*ttydev = strdup (tty_name);	111	*ttydev = strdup (tty_name);
82	return pfd;	112	return pfd;
83	}	113	}
84	#endif	114	#endif
85		115
		116	return -1;
		117	}
		118
		119	static inline int
		120	get_pty__getpty (int fd_tty, char *ttydev)
		121	{
86	#ifdef PTYS_ARE__GETPTY	122	#ifdef PTYS_ARE__GETPTY
		123	int pfd;
		124
87	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	125	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
88	if (*ttydev != NULL)	126	if (*ttydev != NULL)
89	return pfd;	127	return pfd;
90	#endif	128	#endif
91		129
92	#ifdef PTYS_ARE_GETPTY	130	return -1;
93	char *ptydev;	131	}
94		132
95	while ((ptydev = getpty ()) != NULL)	133	static inline int
96	if ((pfd = open (ptydev, O_RDWR \| O_NOCTTY, 0)) >= 0)	134	get_pty_ptc (int fd_tty, char *ttydev)
97	{	135	{
98	*ttydev = ptydev;
99	return pfd;
100	}
101	#endif
102
103	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
104	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_PTMX)
105
106	{
107	# ifdef PTYS_ARE_GETPT
108	pfd = getpt ();
109	# else
110	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
111	# endif
112
113	if (pfd >= 0)
114	{
115	if (grantpt (pfd) == 0 /* change slave permissions */
116	&& unlockpt (pfd) == 0)
117	{ /* slave now unlocked */
118	ttydev = strdup (ptsname (pfd)); / get slave's name */
119	return pfd;
120	}
121	close (pfd);
122	}
123	}
124	# endif
125	#endif
126
127	#ifdef PTYS_ARE_PTC	136	#ifdef PTYS_ARE_PTC
		137	int pfd;
		138
128	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	139	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
129	{	140	{
130	*ttydev = strdup (ttyname (pfd));	141	*ttydev = strdup (ttyname (pfd));
131	return pfd;	142	return pfd;
132	}	143	}
133	#endif	144	#endif
134		145
		146	return -1;
		147	}
		148
		149	static inline int
		150	get_pty_clone (int fd_tty, char *ttydev)
		151	{
135	#ifdef PTYS_ARE_CLONE	152	#ifdef PTYS_ARE_CLONE
		153	int pfd;
		154
136	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)	155	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)
137	{	156	{
138	*ttydev = strdup (ptsname (pfd));	157	*ttydev = strdup (ptsname (pfd));
139	return pfd;	158	return pfd;
140	}	159	}
141	#endif	160	#endif
142		161
		162	return -1;
		163	}
		164
		165	static inline int
		166	get_pty_numeric (int fd_tty, char *ttydev)
		167	{
143	#ifdef PTYS_ARE_NUMERIC	168	#ifdef PTYS_ARE_NUMERIC
144	{	169	int pfd;
145	int idx;	170	int idx;
146	char c1, c2;	171	char c1, c2;
147	char pty_name[] = "/dev/ptyp???";	172	char pty_name[] = "/dev/ptyp???";
148	char tty_name[] = "/dev/ttyp???";	173	char tty_name[] = "/dev/ttyp???";
149		174
150	c1 = &(pty_name[sizeof (pty_name) - 4]);	175	c1 = &(pty_name[sizeof (pty_name) - 4]);
151	c2 = &(tty_name[sizeof (tty_name) - 4]);	176	c2 = &(tty_name[sizeof (tty_name) - 4]);
		177
152	for (idx = 0; idx < 256; idx++)	178	for (idx = 0; idx < 256; idx++)
153	{	179	{
154	sprintf (c1, "%d", idx);	180	sprintf (c1, "%d", idx);
155	sprintf (c2, "%d", idx);	181	sprintf (c2, "%d", idx);
		182
156	if (access (tty_name, F_OK) < 0)	183	if (access (tty_name, F_OK) < 0)
157	{	184	{
158	idx = 256;	185	idx = 256;
159	break;	186	break;
160	}	187	}
161		188
162	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)	189	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
163	{	190	{
164	if (access (tty_name, R_OK \| W_OK) == 0)	191	if (access (tty_name, R_OK \| W_OK) == 0)
165	{	192	{
166	*ttydev = strdup (tty_name);	193	*ttydev = strdup (tty_name);
167	return pfd;	194	return pfd;
168	}	195	}
169		196
170	close (pfd);	197	close (pfd);
171	}	198	}
172	}	199	}
173	}
174	#endif	200	#endif
175		201
		202	return -1;
		203	}
		204
		205	static inline int
		206	get_pty_searched (int fd_tty, char *ttydev)
		207	{
176	#ifdef PTYS_ARE_SEARCHED	208	#ifdef PTYS_ARE_SEARCHED
177	{
178	const char c1, c2;
179	char pty_name[] = "/dev/pty??";
180	char tty_name[] = "/dev/tty??";
181
182	# ifndef PTYCHAR1	209	# ifndef PTYCHAR1
183	# define PTYCHAR1 "pqrstuvwxyz"	210	# define PTYCHAR1 "pqrstuvwxyz"
184	# endif	211	# endif
185	# ifndef PTYCHAR2	212	# ifndef PTYCHAR2
186	# define PTYCHAR2 "0123456789abcdef"	213	# define PTYCHAR2 "0123456789abcdef"
187	# endif	214	# endif
		215	int pfd;
		216	const char c1, c2;
		217	char pty_name[] = "/dev/pty??";
		218	char tty_name[] = "/dev/tty??";
188		219
189	for (c1 = PTYCHAR1; *c1; c1++)	220	for (c1 = PTYCHAR1; *c1; c1++)
190	{	221	{
191	pty_name[ (sizeof (pty_name) - 3)] =	222	pty_name[ (sizeof (pty_name) - 3)] =
192	tty_name[ (sizeof (pty_name) - 3)] = *c1;	223	tty_name[ (sizeof (pty_name) - 3)] = *c1;
		224
193	for (c2 = PTYCHAR2; *c2; c2++)	225	for (c2 = PTYCHAR2; *c2; c2++)
194	{	226	{
195	pty_name[ (sizeof (pty_name) - 2)] =	227	pty_name[ (sizeof (pty_name) - 2)] =
196	tty_name[ (sizeof (pty_name) - 2)] = *c2;	228	tty_name[ (sizeof (pty_name) - 2)] = *c2;
		229
197	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)	230	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
198	{	231	{
199	if (access (tty_name, R_OK \| W_OK) == 0)	232	if (access (tty_name, R_OK \| W_OK) == 0)
200	{	233	{
201	*ttydev = strdup (tty_name);	234	*ttydev = strdup (tty_name);
202	return pfd;	235	return pfd;
203	}	236	}
204		237
205	close (pfd);	238	close (pfd);
206	}	239	}
207	}	240	}
208	}	241	}
209	}
210	#endif	242	#endif
		243
		244	return -1;
		245	}
		246
		247	static int
		248	get_pty (int fd_tty, char *ttydev)
		249	{
		250	int pfd;
		251
		252	if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
		253	\|\| (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
		254	\|\| (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
		255	\|\| (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
		256	\|\| (pfd = get_pty_clone (fd_tty, ttydev)) != -1
		257	\|\| (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
		258	\|\| (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
		259	return pfd;
211		260
212	return -1;	261	return -1;
213	}	262	}
214		263
215	/----------------------------------------------------------------------/	264	/----------------------------------------------------------------------/
…		…
225	/----------------------------------------------------------------------/	274	/----------------------------------------------------------------------/
226	/*	275	/*
227	* Make our tty a controlling tty so that /dev/tty points to us	276	* Make our tty a controlling tty so that /dev/tty points to us
228	*/	277	*/
229	static int	278	static int
230	control_tty (int fd_tty, const char *ttydev)	279	control_tty (int fd_tty)
231	{	280	{
232	#ifndef __QNX__
233	int fd;
234
235	/* ---------------------------------------- */
236	# ifdef HAVE_SETSID
237	setsid ();	281	setsid ();
238	# endif
239	# if defined(HAVE_SETPGID)
240	setpgid (0, 0);
241	# elif defined(HAVE_SETPGRP)
242	setpgrp (0, 0);
243	# endif
244		282
245	/* ---------------------------------------- */
246	# ifdef TIOCNOTTY
247	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
248	if (fd >= 0)
249	{
250	ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
251	close (fd);
252	}
253	# endif
254
255	/* ---------------------------------------- */
256	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
257	if (fd >= 0)
258	close (fd); /* ouch: still have controlling tty */
259
260	/* ---------------------------------------- */
261	#if defined(PTYS_ARE_PTMX) && defined(I_PUSH)	283	#if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
262	/*	284	/*
263	* Push STREAMS modules:	285	* Push STREAMS modules:
264	* ptem: pseudo-terminal hardware emulation module.	286	* ptem: pseudo-terminal hardware emulation module.
265	* ldterm: standard terminal line discipline.	287	* ldterm: standard terminal line discipline.
…		…
283	ioctl (fd_tty, I_PUSH, "ptem");	305	ioctl (fd_tty, I_PUSH, "ptem");
284	ioctl (fd_tty, I_PUSH, "ldterm");	306	ioctl (fd_tty, I_PUSH, "ldterm");
285	ioctl (fd_tty, I_PUSH, "ttcompat");	307	ioctl (fd_tty, I_PUSH, "ttcompat");
286	}	308	}
287	#endif	309	#endif
288	/* ---------------------------------------- */	310
289	# if defined(TIOCSCTTY)
290	fd = ioctl (fd_tty, TIOCSCTTY, NULL);	311	ioctl (fd_tty, TIOCSCTTY, NULL);
291	# elif defined(TIOCSETCTTY)	312
292	fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
293	# else
294	fd = open (ttydev, O_RDWR);
295	if (fd >= 0)
296	close (fd);
297	# endif
298	/* ---------------------------------------- */
299	fd = open ("/dev/tty", O_WRONLY);	313	int fd = open ("/dev/tty", O_WRONLY);
300	if (fd < 0)	314	if (fd < 0)
301	return -1; /* fatal */	315	return -1; /* fatal */
		316
302	close (fd);	317	close (fd);
303	/* ---------------------------------------- */
304	#endif /* ! __QNX__ */
305		318
306	return 0;	319	return 0;
307	}	320	}
308		321
309	#ifndef NO_SETOWNER_TTYDEV	322	void
		323	rxvt_ptytty::close_tty ()
		324	{
		325	if (tty < 0)
		326	return;
		327
		328	close (tty);
		329	tty = -1;
		330	}
		331
		332	bool
		333	rxvt_ptytty::make_controlling_tty ()
		334	{
		335	return control_tty (tty) >= 0;
		336	}
		337
		338	void
		339	rxvt_ptytty::set_utf8_mode (bool on)
		340	{
		341	#ifdef IUTF8
		342	if (pty < 0)
		343	return;
		344
		345	struct termios tio;
		346
		347	if (tcgetattr (pty, &tio) != -1)
		348	{
		349	tcflag_t new_cflag = tio.c_iflag;
		350
		351	if (on)
		352	new_cflag \|= IUTF8;
		353	else
		354	new_cflag &= ~IUTF8;
		355
		356	if (new_cflag != tio.c_iflag)
		357	{
		358	tio.c_iflag = new_cflag;
		359	tcsetattr (pty, TCSANOW, &tio);
		360	}
		361	}
		362	#endif
		363	}
		364
310	static struct ttyconf {	365	static struct ttyconf {
311	gid_t gid;	366	gid_t gid;
312	mode_t mode;	367	mode_t mode;
313		368
314	ttyconf ()	369	ttyconf ()
…		…
323	}	378	}
324	else	379	else
325	#endif /* TTY_GID_SUPPORT */	380	#endif /* TTY_GID_SUPPORT */
326	{	381	{
327	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;	382	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;
328	gid = getgid ();	383	gid = 0;
329	}	384	}
330	}	385	}
331	} ttyconf;	386	} ttyconf;
332		387
		388	rxvt_ptytty_unix::rxvt_ptytty_unix ()
		389	{
		390	name = 0;
		391	#if UTMP_SUPPORT
		392	cmd_pid = 0;
		393	#endif
		394	}
		395
		396	rxvt_ptytty_unix::~rxvt_ptytty_unix ()
		397	{
		398	#if UTMP_SUPPORT
		399	logout ();
		400	#endif
		401	put ();
		402	}
		403
333	void	404	void
334	rxvt_ptytty::privileges (rxvt_privaction action)	405	rxvt_ptytty_unix::put ()
335	{	406	{
336	if (!name \|\| !*name)	407	chmod (name, RESTORE_TTY_MODE);
337	return;	408	chown (name, 0, ttyconf.gid);
338		409
339	rxvt_privileges (RESTORE);	410	close_tty ();
340		411
341	if (action == SAVE)	412	if (pty >= 0)
342	{	413	close (pty);
343	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
344	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
345	if (lstat (name, &savestat) < 0) /* you lose out */
346	;
347	else
348	# endif
349	{
350	saved = true;
351	chown (name, getuid (), ttyconf.gid); /* fail silently */
352	chmod (name, ttyconf.mode);
353	# ifdef HAVE_REVOKE
354	revoke (name);
355	# endif
356	}
357	}
358	else
359	{ /* action == RESTORE */
360	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
361	if (saved)
362	{
363	chmod (name, savestat.st_mode);
364	chown (name, savestat.st_uid, savestat.st_gid);
365	}
366	# else
367	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
368	chown (name, 0, 0);
369	# endif
370		414
371	}	415	free (name);
372		416
373	rxvt_privileges (IGNORE);
374	}
375	#endif
376
377	rxvt_ptytty::rxvt_ptytty ()
378	{
379	pty = tty = -1;	417	pty = tty = -1;
380	name = 0;	418	name = 0;
381	#ifndef NO_SETOWNER_TTYDEV
382	saved = false;
383	#endif
384	}
385
386	rxvt_ptytty::~rxvt_ptytty ()
387	{
388	put ();
389	}
390
391	void
392
393	rxvt_ptytty::close_tty ()
394	{
395	if (tty < 0)
396	return;
397
398	close (tty);
399	tty = -1;
400	}
401
402	void
403	rxvt_ptytty::put ()
404	{
405	#ifndef NO_SETOWNER_TTYDEV
406	privileges (RESTORE);
407	#endif
408
409	if (pty >= 0) close (pty);
410	close_tty ();
411	free (name);
412
413	pty = tty = -1;
414	name = 0;
415	}	419	}
416		420
417	bool	421	bool
418	rxvt_ptytty::make_controlling_tty ()
419	{
420	return control_tty (tty, name) >= 0;
421	}
422
423	bool
424	rxvt_ptytty::get ()	422	rxvt_ptytty_unix::get ()
425	{	423	{
426	/* get master (pty) */	424	/* get master (pty) */
427	if ((pty = get_pty (&tty, &name)) < 0)	425	if ((pty = get_pty (&tty, &name)) < 0)
428	return false;	426	return false;
429		427
…		…
431		429
432	/* get slave (tty) */	430	/* get slave (tty) */
433	if (tty < 0)	431	if (tty < 0)
434	{	432	{
435	#ifndef NO_SETOWNER_TTYDEV	433	#ifndef NO_SETOWNER_TTYDEV
436	privileges (SAVE);	434	chown (name, getuid (), ttyconf.gid); /* fail silently */
		435	chmod (name, ttyconf.mode);
		436	# ifdef HAVE_REVOKE
		437	revoke (name);
		438	# endif
437	#endif	439	#endif
438		440
439	if ((tty = get_tty (name)) < 0)	441	if ((tty = get_tty (name)) < 0)
440	{	442	{
441	put ();	443	put ();
…		…
444	}	446	}
445		447
446	return true;	448	return true;
447	}	449	}
448		450
		451	#if PTYTTY_HELPER
		452
		453	static int sock_fd;
		454	static int pid;
		455
		456	struct command
		457	{
		458	enum { get, login, destroy } type;
		459
		460	rxvt_ptytty *id;
		461
		462	bool login_shell;
		463	int cmd_pid;
		464	char hostname[512]; // arbitrary, but should be plenty
		465	};
		466
		467	struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
		468	{
		469	rxvt_ptytty *id;
		470
		471	~rxvt_ptytty_proxy ();
		472
		473	bool get ();
		474	void login (int cmd_pid, bool login_shell, const char *hostname);
		475	};
		476
		477	bool
		478	rxvt_ptytty_proxy::get ()
		479	{
		480	command cmd;
		481
		482	cmd.type = command::get;
		483
		484	write (sock_fd, &cmd, sizeof (cmd));
		485
		486	if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
		487	rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
		488
		489	if (!id)
		490	return false;
		491
		492	if ((pty = rxvt_recv_fd (sock_fd)) < 0
		493	\|\| (tty = rxvt_recv_fd (sock_fd)) < 0)
		494	rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
		495
		496	return true;
		497	}
		498
449	void	499	void
450	rxvt_ptytty::set_utf8_mode (bool on)	500	rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
451	{	501	{
452	#ifdef IUTF8	502	command cmd;
453	if (pty < 0)
454	return;
455		503
456	struct termios tio;	504	cmd.type = command::login;
		505	cmd.id = id;
		506	cmd.cmd_pid = cmd_pid;
		507	cmd.login_shell = login_shell;
		508	strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
457		509
458	if (tcgetattr (pty, &tio) != -1)	510	write (sock_fd, &cmd, sizeof (cmd));
459	{	511	}
460	tcflag_t new_cflag = tio.c_iflag;
461		512
462	if (on)	513	rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
463	new_cflag \|= IUTF8;	514	{
		515	command cmd;
		516
		517	cmd.type = command::destroy;
		518	cmd.id = id;
		519
		520	write (sock_fd, &cmd, sizeof (cmd));
		521	}
		522
		523	static
		524	void serve ()
		525	{
		526	command cmd;
		527	vector<rxvt_ptytty *> ptys;
		528
		529	while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
		530	{
		531	if (cmd.type == command::get)
		532	{
		533	// -> id ptyfd ttyfd
		534	cmd.id = new rxvt_ptytty_unix;
		535
		536	if (cmd.id->get ())
		537	{
		538	write (sock_fd, &cmd.id, sizeof (cmd.id));
		539	ptys.push_back (cmd.id);
		540
		541	rxvt_send_fd (sock_fd, cmd.id->pty);
		542	rxvt_send_fd (sock_fd, cmd.id->tty);
		543	}
		544	else
		545	{
		546	delete cmd.id;
		547	cmd.id = 0;
		548	write (sock_fd, &cmd.id, sizeof (cmd.id));
		549	}
		550	}
		551	else if (cmd.type == command::login)
		552	{
		553	#if UTMP_SUPPORT
		554	if (find (ptys.begin (), ptys.end (), cmd.id))
		555	{
		556	cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
		557	cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
		558	}
		559	#endif
		560	}
		561	else if (cmd.type == command::destroy)
		562	{
		563	rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
		564
		565	if (pty)
		566	{
		567	delete *pty;
		568	ptys.erase (pty);
		569	}
		570	}
464	else	571	else
465	new_cflag &= ~IUTF8;	572	break;
		573	}
466		574
467	if (new_cflag != tio.c_iflag)	575	// destroy all ptys
468	{	576	for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
469	tio.c_iflag = new_cflag;	577	delete *i;
470	tcsetattr (pty, TCSANOW, &tio);	578	}
471	}	579
		580	void rxvt_ptytty_server ()
		581	{
		582	int sv[2];
		583
		584	if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
		585	rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
		586
		587	pid = fork ();
		588
		589	if (pid < 0)
		590	rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
		591
		592	if (pid)
472	}	593	{
		594	// client, urxvt
		595	sock_fd = sv[0];
		596	close (sv[1]);
		597	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
		598	}
		599	else
		600	{
		601	// server, pty-helper
		602	sock_fd = sv[1];
		603
		604	for (int fd = 0; fd < 1023; fd++)
		605	if (fd != sock_fd)
		606	close (fd);
		607
		608	serve ();
		609	_exit (EXIT_SUCCESS);
		610	}
		611	}
		612
473	#endif	613	#endif
		614
		615	// a "factory" g
		616	rxvt_ptytty *
		617	rxvt_new_ptytty ()
		618	{
		619	#if PTYTTY_HELPER
		620	if (pid > 0)
		621	// use helper process
		622	return new rxvt_ptytty_proxy;
		623	else
		624	#endif
		625	return new rxvt_ptytty_unix;
474	}	626	}
475		627
476	/----------------------- end-of-file (C source) -----------------------/	628	/----------------------- end-of-file (C source) -----------------------/
477		629

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs. Revision 1.52 by root, Thu Jan 19 20:30:36 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.52 by root, Thu Jan 19 20:30:36 2006 UTC