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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.37 by root, Tue Jan 17 11:02:10 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		58
59	/////////////////////////////////////////////////////////////////////////////	59	/////////////////////////////////////////////////////////////////////////////
60		60
61	/* ------------------------------------------------------------------------- *	61	/* ------------------------------------------------------------------------- *
62	* GET PSEUDO TELETYPE - MASTER AND SLAVE *	62	* GET PSEUDO TELETYPE - MASTER AND SLAVE *
…		…
64	/*	64	/*
65	* Returns pty file descriptor, or -1 on failure	65	* Returns pty file descriptor, or -1 on failure
66	* 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.
67	* 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
68	*/	68	*/
69	static int	69	static inline int
70	get_pty (int fd_tty, char *ttydev)	70	get_pty_streams (int fd_tty, char *ttydev)
71	{	71	{
		72	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
		73	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)
72	int pfd;	74	int pfd;
73		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	{
74	#ifdef PTYS_ARE_OPENPTY	103	#ifdef PTYS_ARE_OPENPTY
75	char tty_name[sizeof "/dev/pts/????\0"];	104	int pfd;
76		105	int res;
77	rxvt_privileges(RESTORE);	106	char tty_name[32];
		107
78	int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);	108	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79	rxvt_privileges(IGNORE);
80
81	if (res != -1)	109	if (res != -1)
82	{	110	{
83	*ttydev = strdup (tty_name);	111	*ttydev = strdup (tty_name);
84	return pfd;	112	return pfd;
85	}	113	}
86	#endif	114	#endif
87		115
		116	return -1;
		117	}
		118
		119	static inline int
		120	get_pty__getpty (int fd_tty, char *ttydev)
		121	{
88	#ifdef PTYS_ARE__GETPTY	122	#ifdef PTYS_ARE__GETPTY
		123	int pfd;
		124
89	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	125	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
90	if (*ttydev != NULL)	126	if (*ttydev != NULL)
91	return pfd;	127	return pfd;
92	#endif	128	#endif
93		129
94	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	130	return -1;
95	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)	131	}
96		132
97	{	133	static inline int
98	# ifdef PTYS_ARE_GETPT	134	get_pty_ptc (int fd_tty, char *ttydev)
99	pfd = getpt();	135	{
100	# else
101	# ifdef PTYS_ARE_POSIX
102	pfd = posix_openpt (O_RDWR);
103	# else
104	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
105	# endif
106	# endif
107
108	if (pfd >= 0)
109	{
110	if (grantpt (pfd) == 0 /* change slave permissions */
111	&& unlockpt (pfd) == 0)
112	{ /* slave now unlocked */
113	ttydev = strdup (ptsname (pfd)); / get slave's name */
114	return pfd;
115	}
116	close (pfd);
117	}
118	}
119	# endif
120	#endif
121
122	#ifdef PTYS_ARE_PTC	136	#ifdef PTYS_ARE_PTC
		137	int pfd;
		138
123	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	139	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
124	{	140	{
125	*ttydev = strdup (ttyname (pfd));	141	*ttydev = strdup (ttyname (pfd));
126	return pfd;	142	return pfd;
127	}	143	}
128	#endif	144	#endif
129		145
		146	return -1;
		147	}
		148
		149	static inline int
		150	get_pty_clone (int fd_tty, char *ttydev)
		151	{
130	#ifdef PTYS_ARE_CLONE	152	#ifdef PTYS_ARE_CLONE
		153	int pfd;
		154
131	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)
132	{	156	{
133	*ttydev = strdup (ptsname (pfd));	157	*ttydev = strdup (ptsname (pfd));
134	return pfd;	158	return pfd;
135	}	159	}
136	#endif	160	#endif
137		161
		162	return -1;
		163	}
		164
		165	static inline int
		166	get_pty_numeric (int fd_tty, char *ttydev)
		167	{
138	#ifdef PTYS_ARE_NUMERIC	168	#ifdef PTYS_ARE_NUMERIC
139	{	169	int pfd;
140	int idx;	170	int idx;
141	char c1, c2;	171	char c1, c2;
142	char pty_name[] = "/dev/ptyp???";	172	char pty_name[] = "/dev/ptyp???";
143	char tty_name[] = "/dev/ttyp???";	173	char tty_name[] = "/dev/ttyp???";
144		174
145	c1 = &(pty_name[sizeof (pty_name) - 4]);	175	c1 = &(pty_name[sizeof (pty_name) - 4]);
146	c2 = &(tty_name[sizeof (tty_name) - 4]);	176	c2 = &(tty_name[sizeof (tty_name) - 4]);
		177
147	for (idx = 0; idx < 256; idx++)	178	for (idx = 0; idx < 256; idx++)
148	{	179	{
149	sprintf (c1, "%d", idx);	180	sprintf (c1, "%d", idx);
150	sprintf (c2, "%d", idx);	181	sprintf (c2, "%d", idx);
		182
151	if (access (tty_name, F_OK) < 0)	183	if (access (tty_name, F_OK) < 0)
152	{	184	{
153	idx = 256;	185	idx = 256;
154	break;	186	break;
155	}	187	}
156		188
157	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)	189	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
158	{	190	{
159	if (access (tty_name, R_OK \| W_OK) == 0)	191	if (access (tty_name, R_OK \| W_OK) == 0)
160	{	192	{
161	*ttydev = strdup (tty_name);	193	*ttydev = strdup (tty_name);
162	return pfd;	194	return pfd;
163	}	195	}
164		196
165	close (pfd);	197	close (pfd);
166	}	198	}
167	}	199	}
168	}
169	#endif	200	#endif
170		201
		202	return -1;
		203	}
		204
		205	static inline int
		206	get_pty_searched (int fd_tty, char *ttydev)
		207	{
171	#ifdef PTYS_ARE_SEARCHED	208	#ifdef PTYS_ARE_SEARCHED
172	{
173	const char c1, c2;
174	char pty_name[] = "/dev/pty??";
175	char tty_name[] = "/dev/tty??";
176
177	# ifndef PTYCHAR1	209	# ifndef PTYCHAR1
178	# define PTYCHAR1 "pqrstuvwxyz"	210	# define PTYCHAR1 "pqrstuvwxyz"
179	# endif	211	# endif
180	# ifndef PTYCHAR2	212	# ifndef PTYCHAR2
181	# define PTYCHAR2 "0123456789abcdef"	213	# define PTYCHAR2 "0123456789abcdef"
182	# endif	214	# endif
		215	int pfd;
		216	const char c1, c2;
		217	char pty_name[] = "/dev/pty??";
		218	char tty_name[] = "/dev/tty??";
183		219
184	for (c1 = PTYCHAR1; *c1; c1++)	220	for (c1 = PTYCHAR1; *c1; c1++)
185	{	221	{
186	pty_name[ (sizeof (pty_name) - 3)] =	222	pty_name[ (sizeof (pty_name) - 3)] =
187	tty_name[ (sizeof (pty_name) - 3)] = *c1;	223	tty_name[ (sizeof (pty_name) - 3)] = *c1;
		224
188	for (c2 = PTYCHAR2; *c2; c2++)	225	for (c2 = PTYCHAR2; *c2; c2++)
189	{	226	{
190	pty_name[ (sizeof (pty_name) - 2)] =	227	pty_name[ (sizeof (pty_name) - 2)] =
191	tty_name[ (sizeof (pty_name) - 2)] = *c2;	228	tty_name[ (sizeof (pty_name) - 2)] = *c2;
		229
192	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)	230	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
193	{	231	{
194	if (access (tty_name, R_OK \| W_OK) == 0)	232	if (access (tty_name, R_OK \| W_OK) == 0)
195	{	233	{
196	*ttydev = strdup (tty_name);	234	*ttydev = strdup (tty_name);
197	return pfd;	235	return pfd;
198	}	236	}
199		237
200	close (pfd);	238	close (pfd);
201	}	239	}
202	}	240	}
203	}	241	}
204	}
205	#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;
206		260
207	return -1;	261	return -1;
208	}	262	}
209		263
210	/----------------------------------------------------------------------/	264	/----------------------------------------------------------------------/
…		…
222	* 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
223	*/	277	*/
224	static int	278	static int
225	control_tty (int fd_tty)	279	control_tty (int fd_tty)
226	{	280	{
227	int fd;
228
229	/* ---------------------------------------- */
230	# ifdef HAVE_SETSID
231	setsid ();	281	setsid ();
232	# endif
233	# if defined(HAVE_SETPGID)
234	setpgid (0, 0);
235	# elif defined(HAVE_SETPGRP)
236	setpgrp (0, 0);
237	# endif
238		282
239	/* ---------------------------------------- */
240	# ifdef TIOCNOTTY
241	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
242	if (fd >= 0)
243	{
244	ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
245	close (fd);
246	}
247	# endif
248
249	/* ---------------------------------------- */
250	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
251	if (fd >= 0)
252	close (fd); /* ouch: still have controlling tty */
253
254	/* ---------------------------------------- */
255	# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)	283	#if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
256	/*	284	/*
257	* Push STREAMS modules:	285	* Push STREAMS modules:
258	* ptem: pseudo-terminal hardware emulation module.	286	* ptem: pseudo-terminal hardware emulation module.
259	* ldterm: standard terminal line discipline.	287	* ldterm: standard terminal line discipline.
260	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.	288	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
…		…
268	* documentation is really unclear about whether it is any close () on	296	* documentation is really unclear about whether it is any close () on
269	* the master side or the last close () - i.e. a proper STREAMS dismantling	297	* the master side or the last close () - i.e. a proper STREAMS dismantling
270	* close () - on the master side which causes a hang up to be sent	298	* close () - on the master side which causes a hang up to be sent
271	* through - Geoff Wing	299	* through - Geoff Wing
272	*/	300	*/
273	# ifdef HAVE_ISASTREAM	301	# ifdef HAVE_ISASTREAM
274	if (isastream (fd_tty) == 1)	302	if (isastream (fd_tty) == 1)
275	# endif	303	# endif
276	{	304	{
277	ioctl (fd_tty, I_PUSH, "ptem");	305	ioctl (fd_tty, I_PUSH, "ptem");
278	ioctl (fd_tty, I_PUSH, "ldterm");	306	ioctl (fd_tty, I_PUSH, "ldterm");
279	ioctl (fd_tty, I_PUSH, "ttcompat");	307	ioctl (fd_tty, I_PUSH, "ttcompat");
280	}	308	}
281	# endif	309	#endif
282	/* ---------------------------------------- */	310
283	fd = ioctl (fd_tty, TIOCSCTTY, NULL);	311	ioctl (fd_tty, TIOCSCTTY, NULL);
284	/* ---------------------------------------- */	312
285	fd = open ("/dev/tty", O_WRONLY);	313	int fd = open ("/dev/tty", O_WRONLY);
286	if (fd < 0)	314	if (fd < 0)
287	return -1; /* fatal */	315	return -1; /* fatal */
		316
288	close (fd);	317	close (fd);
289	/* ---------------------------------------- */
290		318
291	return 0;	319	return 0;
292	}	320	}
293		321
294	void	322	void
…		…
332	}	360	}
333	}	361	}
334	#endif	362	#endif
335	}	363	}
336		364
337	/////////////////////////////////////////////////////////////////////////////
338
339	#ifndef NO_SETOWNER_TTYDEV
340	static struct ttyconf {	365	static struct ttyconf {
341	gid_t gid;	366	gid_t gid;
342	mode_t mode;	367	mode_t mode;
343		368
344	ttyconf ()	369	ttyconf ()
…		…
353	}	378	}
354	else	379	else
355	#endif /* TTY_GID_SUPPORT */	380	#endif /* TTY_GID_SUPPORT */
356	{	381	{
357	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;	382	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;
358	gid = getgid ();	383	gid = 0;
359	}	384	}
360	}	385	}
361	} ttyconf;	386	} ttyconf;
362		387
363	/////////////////////////////////////////////////////////////////////////////
364
365	void
366	rxvt_ptytty_unix::privileges (rxvt_privaction action)
367	{
368	if (!name \|\| !*name)
369	return;
370
371	rxvt_privileges (RESTORE);
372
373	if (action == SAVE)
374	{
375	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
376	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
377	if (lstat (name, &savestat) < 0) /* you lose out */
378	;
379	else
380	# endif
381	{
382	saved = true;
383	chown (name, getuid (), ttyconf.gid); /* fail silently */
384	chmod (name, ttyconf.mode);
385	# ifdef HAVE_REVOKE
386	revoke (name);
387	# endif
388	}
389	}
390	else
391	{ /* action == RESTORE */
392	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
393	if (saved)
394	{
395	chmod (name, savestat.st_mode);
396	chown (name, savestat.st_uid, savestat.st_gid);
397	}
398	# else
399	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
400	chown (name, 0, 0);
401	# endif
402
403	}
404
405	rxvt_privileges (IGNORE);
406	}
407	#endif
408
409	rxvt_ptytty_unix::rxvt_ptytty_unix ()	388	rxvt_ptytty_unix::rxvt_ptytty_unix ()
410	{	389	{
411	pty = tty = -1;
412	name = 0;	390	name = 0;
413	#ifndef NO_SETOWNER_TTYDEV
414	saved = false;
415	#endif
416	#if UTMP_SUPPORT	391	#if UTMP_SUPPORT
417	cmd_pid = 0;	392	cmd_pid = 0;
418	#endif	393	#endif
419	}	394	}
420		395
421	rxvt_ptytty_unix::~rxvt_ptytty_unix ()	396	rxvt_ptytty_unix::~rxvt_ptytty_unix ()
422	{	397	{
		398	#if UTMP_SUPPORT
423	logout ();	399	logout ();
		400	#endif
424	put ();	401	put ();
425	}	402	}
426		403
427	void	404	void
428	rxvt_ptytty_unix::put ()	405	rxvt_ptytty_unix::put ()
429	{	406	{
430	#ifndef NO_SETOWNER_TTYDEV	407	chmod (name, RESTORE_TTY_MODE);
431	privileges (RESTORE);	408	chown (name, 0, ttyconf.gid);
432	#endif
433		409
434	if (pty >= 0) close (pty);
435	close_tty ();	410	close_tty ();
		411
		412	if (pty >= 0)
		413	close (pty);
		414
436	free (name);	415	free (name);
437		416
438	pty = tty = -1;	417	pty = tty = -1;
439	name = 0;	418	name = 0;
440	}	419	}
…		…
450		429
451	/* get slave (tty) */	430	/* get slave (tty) */
452	if (tty < 0)	431	if (tty < 0)
453	{	432	{
454	#ifndef NO_SETOWNER_TTYDEV	433	#ifndef NO_SETOWNER_TTYDEV
455	privileges (SAVE);	434	chown (name, getuid (), ttyconf.gid); /* fail silently */
		435	chmod (name, ttyconf.mode);
		436	# ifdef HAVE_REVOKE
		437	revoke (name);
		438	# endif
456	#endif	439	#endif
457		440
458	if ((tty = get_tty (name)) < 0)	441	if ((tty = get_tty (name)) < 0)
459	{	442	{
460	put ();	443	put ();
…		…
463	}	446	}
464		447
465	return true;	448	return true;
466	}	449	}
467		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
		499	void
		500	rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
		501	{
		502	command cmd;
		503
		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));
		509
		510	write (sock_fd, &cmd, sizeof (cmd));
		511	}
		512
		513	rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
		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	}
		571	else
		572	break;
		573	}
		574
		575	// destroy all ptys
		576	for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
		577	delete *i;
		578	}
		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)
		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
		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;
		626	}
		627
468	/----------------------- end-of-file (C source) -----------------------/	628	/----------------------- end-of-file (C source) -----------------------/
469		629

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.37 by root, Tue Jan 17 11:02:10 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.37 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.52 by root, Thu Jan 19 20:30:36 2006 UTC