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

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

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.33 by root, Wed Jan 11 23:08:54 2006 UTC vs. Revision 1.53 by ayin, Sat Jan 21 18:15:26 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.33 by root, Wed Jan 11 23:08:54 2006 UTC vs.
Revision 1.53 by ayin, Sat Jan 21 18:15:26 2006 UTC