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

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

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.34 by ayin, Tue Jan 17 08:54:33 2006 UTC vs. Revision 1.49 by ayin, Thu Jan 19 16:40:42 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.34 by ayin, Tue Jan 17 08:54:33 2006 UTC vs.
Revision 1.49 by ayin, Thu Jan 19 16:40:42 2006 UTC