[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.54 by root, Sun Jan 22 00:48:13 2006 UTC

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

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.54 by root, Sun Jan 22 00:48:13 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.54 by root, Sun Jan 22 00:48:13 2006 UTC