[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.44 by ayin, Tue Jan 17 17:59:31 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	#ifdef NO_SETOWNER_TTYDEV
70	int pfd;	73	int pfd;
71		74
		75	# ifdef PTYS_ARE_GETPT
		76	pfd = getpt();
		77	# else
		78	# ifdef PTYS_ARE_POSIX
		79	pfd = posix_openpt (O_RDWR);
		80	# else
		81	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
		82	# endif
		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	}
		92	close (pfd);
		93	}
		94	#endif
		95	return -1;
		96	}
		97
		98	static inline int
		99	get_pty_openpty (int fd_tty, char *ttydev)
		100	{
72	#ifdef PTYS_ARE_OPENPTY	101	#ifdef PTYS_ARE_OPENPTY
		102	int pfd;
		103	int res;
73	char tty_name[sizeof "/dev/pts/????\0"];	104	char tty_name[sizeof "/dev/pts/????\0"];
74		105
75	rxvt_privileges(RESTORE);
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	112	#endif
		113	return -1;
		114	}
85		115
		116	static inline int
		117	get_pty__getpty (int fd_tty, char *ttydev)
		118	{
86	#ifdef PTYS_ARE__GETPTY	119	#ifdef PTYS_ARE__GETPTY
		120	int pfd;
		121
87	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	122	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
88	if (*ttydev != NULL)	123	if (*ttydev != NULL)
89	return pfd;	124	return pfd;
90	#endif	125	#endif
		126	return -1;
		127	}
91		128
92	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	129	static inline int
93	# if defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)	130	get_pty_ptc (int fd_tty, char *ttydev)
94		131	{
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	132	#ifdef PTYS_ARE_PTC
		133	int pfd;
		134
117	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	135	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
118	{	136	{
119	*ttydev = strdup (ttyname (pfd));	137	*ttydev = strdup (ttyname (pfd));
120	return pfd;	138	return pfd;
121	}	139	}
122	#endif	140	#endif
		141	return -1;
		142	}
123		143
		144	static inline int
		145	get_pty_clone (int fd_tty, char *ttydev)
		146	{
124	#ifdef PTYS_ARE_CLONE	147	#ifdef PTYS_ARE_CLONE
		148	int pfd;
		149
125	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)	150	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)
126	{	151	{
127	*ttydev = strdup (ptsname (pfd));	152	*ttydev = strdup (ptsname (pfd));
128	return pfd;	153	return pfd;
129	}	154	}
130	#endif	155	#endif
		156	return -1;
		157	}
131		158
		159	static inline int
		160	get_pty_numeric (int fd_tty, char *ttydev)
		161	{
132	#ifdef PTYS_ARE_NUMERIC	162	#ifdef PTYS_ARE_NUMERIC
133	{	163	int pfd;
134	int idx;	164	int idx;
135	char c1, c2;	165	char c1, c2;
136	char pty_name[] = "/dev/ptyp???";	166	char pty_name[] = "/dev/ptyp???";
137	char tty_name[] = "/dev/ttyp???";	167	char tty_name[] = "/dev/ttyp???";
138		168
…		…
157	}	187	}
158		188
159	close (pfd);	189	close (pfd);
160	}	190	}
161	}	191	}
162	}
163	#endif	192	#endif
		193	return -1;
		194	}
164		195
		196	static inline int
		197	get_pty_searched (int fd_tty, char *ttydev)
		198	{
165	#ifdef PTYS_ARE_SEARCHED	199	#ifdef PTYS_ARE_SEARCHED
166	{	200	# ifndef PTYCHAR1
		201	# define PTYCHAR1 "pqrstuvwxyz"
		202	# endif
		203	# ifndef PTYCHAR2
		204	# define PTYCHAR2 "0123456789abcdef"
		205	# endif
		206	int pfd;
167	const char c1, c2;	207	const char c1, c2;
168	char pty_name[] = "/dev/pty??";	208	char pty_name[] = "/dev/pty??";
169	char tty_name[] = "/dev/tty??";	209	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		210
178	for (c1 = PTYCHAR1; *c1; c1++)	211	for (c1 = PTYCHAR1; *c1; c1++)
179	{	212	{
180	pty_name[ (sizeof (pty_name) - 3)] =	213	pty_name[ (sizeof (pty_name) - 3)] =
181	tty_name[ (sizeof (pty_name) - 3)] = *c1;	214	tty_name[ (sizeof (pty_name) - 3)] = *c1;
…		…
193		226
194	close (pfd);	227	close (pfd);
195	}	228	}
196	}	229	}
197	}	230	}
198	}
199	#endif	231	#endif
		232	return -1;
		233	}
200		234
		235	static int
		236	get_pty (int fd_tty, char *ttydev)
		237	{
		238	int pfd;
		239
		240	if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
		241	\|\| (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
		242	\|\| (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
		243	\|\| (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
		244	\|\| (pfd = get_pty_clone (fd_tty, ttydev)) != -1
		245	\|\| (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
		246	\|\| (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
		247	return pfd;
201	return -1;	248	return -1;
202	}	249	}
203		250
204	/----------------------------------------------------------------------/	251	/----------------------------------------------------------------------/
205	/*	252	/*
…		…
214	/----------------------------------------------------------------------/	261	/----------------------------------------------------------------------/
215	/*	262	/*
216	* Make our tty a controlling tty so that /dev/tty points to us	263	* Make our tty a controlling tty so that /dev/tty points to us
217	*/	264	*/
218	static int	265	static int
219	control_tty (int fd_tty, const char *ttydev)	266	control_tty (int fd_tty)
220	{	267	{
221	#ifndef __QNX__
222	int fd;	268	int fd;
223		269
224	/* ---------------------------------------- */	270	/* ---------------------------------------- */
225	# ifdef HAVE_SETSID
226	setsid ();	271	setsid ();
227	# endif
228	# if defined(HAVE_SETPGID)
229	setpgid (0, 0);
230	# elif defined(HAVE_SETPGRP)
231	setpgrp (0, 0);
232	# endif
233		272
234	/* ---------------------------------------- */	273	/* ---------------------------------------- */
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)	274	# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
251	/*	275	/*
252	* Push STREAMS modules:	276	* Push STREAMS modules:
253	* ptem: pseudo-terminal hardware emulation module.	277	* ptem: pseudo-terminal hardware emulation module.
254	* ldterm: standard terminal line discipline.	278	* ldterm: standard terminal line discipline.
255	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.	279	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
…		…
263	* documentation is really unclear about whether it is any close () on	287	* documentation is really unclear about whether it is any close () on
264	* the master side or the last close () - i.e. a proper STREAMS dismantling	288	* the master side or the last close () - i.e. a proper STREAMS dismantling
265	* close () - on the master side which causes a hang up to be sent	289	* close () - on the master side which causes a hang up to be sent
266	* through - Geoff Wing	290	* through - Geoff Wing
267	*/	291	*/
268	# ifdef HAVE_ISASTREAM	292	# ifdef HAVE_ISASTREAM
269	if (isastream (fd_tty) == 1)	293	if (isastream (fd_tty) == 1)
270	# endif	294	# endif
271	{	295	{
272	ioctl (fd_tty, I_PUSH, "ptem");	296	ioctl (fd_tty, I_PUSH, "ptem");
273	ioctl (fd_tty, I_PUSH, "ldterm");	297	ioctl (fd_tty, I_PUSH, "ldterm");
274	ioctl (fd_tty, I_PUSH, "ttcompat");	298	ioctl (fd_tty, I_PUSH, "ttcompat");
275	}	299	}
276	#endif	300	# endif
277	/* ---------------------------------------- */	301	/* ---------------------------------------- */
278	# if defined(TIOCSCTTY)
279	fd = ioctl (fd_tty, TIOCSCTTY, NULL);	302	fd = ioctl (fd_tty, TIOCSCTTY, NULL);
280	# elif defined(TIOCSETCTTY)
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	/* ---------------------------------------- */	303	/* ---------------------------------------- */
288	fd = open ("/dev/tty", O_WRONLY);	304	fd = open ("/dev/tty", O_WRONLY);
289	if (fd < 0)	305	if (fd < 0)
290	return -1; /* fatal */	306	return -1; /* fatal */
291	close (fd);	307	close (fd);
292	/* ---------------------------------------- */	308	/* ---------------------------------------- */
293	#endif /* ! __QNX__ */
294		309
295	return 0;	310	return 0;
296	}	311	}
		312
		313	void
		314	rxvt_ptytty::close_tty ()
		315	{
		316	if (tty < 0)
		317	return;
		318
		319	close (tty);
		320	tty = -1;
		321	}
		322
		323	bool
		324	rxvt_ptytty::make_controlling_tty ()
		325	{
		326	return control_tty (tty) >= 0;
		327	}
		328
		329	void
		330	rxvt_ptytty::set_utf8_mode (bool on)
		331	{
		332	#ifdef IUTF8
		333	if (pty < 0)
		334	return;
		335
		336	struct termios tio;
		337
		338	if (tcgetattr (pty, &tio) != -1)
		339	{
		340	tcflag_t new_cflag = tio.c_iflag;
		341
		342	if (on)
		343	new_cflag \|= IUTF8;
		344	else
		345	new_cflag &= ~IUTF8;
		346
		347	if (new_cflag != tio.c_iflag)
		348	{
		349	tio.c_iflag = new_cflag;
		350	tcsetattr (pty, TCSANOW, &tio);
		351	}
		352	}
		353	#endif
		354	}
		355
		356	/////////////////////////////////////////////////////////////////////////////
297		357
298	#ifndef NO_SETOWNER_TTYDEV	358	#ifndef NO_SETOWNER_TTYDEV
299	static struct ttyconf {	359	static struct ttyconf {
300	gid_t gid;	360	gid_t gid;
301	mode_t mode;	361	mode_t mode;
…		…
317	gid = getgid ();	377	gid = getgid ();
318	}	378	}
319	}	379	}
320	} ttyconf;	380	} ttyconf;
321		381
		382	/////////////////////////////////////////////////////////////////////////////
		383
322	void	384	void
323	rxvt_ptytty::privileges (rxvt_privaction action)	385	rxvt_ptytty_unix::privileges (rxvt_privaction action)
324	{	386	{
325	if (!name \|\| !*name)	387	if (!name \|\| !*name)
326	return;	388	return;
327
328	rxvt_privileges (RESTORE);
329		389
330	if (action == SAVE)	390	if (action == SAVE)
331	{	391	{
332	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	392	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
333	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */	393	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
…		…
356	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));	416	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
357	chown (name, 0, 0);	417	chown (name, 0, 0);
358	# endif	418	# endif
359		419
360	}	420	}
361
362	rxvt_privileges (IGNORE);
363	}	421	}
364	#endif	422	#endif
365		423
366	rxvt_ptytty::rxvt_ptytty ()	424	rxvt_ptytty_unix::rxvt_ptytty_unix ()
367	{	425	{
368	pty = tty = -1;	426	pty = tty = -1;
369	name = 0;	427	name = 0;
370	#ifndef NO_SETOWNER_TTYDEV	428	#ifndef NO_SETOWNER_TTYDEV
371	saved = false;	429	saved = false;
372	#endif	430	#endif
		431	#if UTMP_SUPPORT
		432	cmd_pid = 0;
		433	#endif
373	}	434	}
374		435
375	rxvt_ptytty::~rxvt_ptytty ()	436	rxvt_ptytty_unix::~rxvt_ptytty_unix ()
376	{	437	{
		438	#if UTMP_SUPPORT
		439	logout ();
		440	#endif
377	put ();	441	put ();
378	}	442	}
379		443
380	void	444	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 ()	445	rxvt_ptytty_unix::put ()
393	{	446	{
394	#ifndef NO_SETOWNER_TTYDEV	447	#ifndef NO_SETOWNER_TTYDEV
395	privileges (RESTORE);	448	privileges (RESTORE);
396	#endif	449	#endif
397		450
…		…
402	pty = tty = -1;	455	pty = tty = -1;
403	name = 0;	456	name = 0;
404	}	457	}
405		458
406	bool	459	bool
407	rxvt_ptytty::make_controlling_tty ()
408	{
409	return control_tty (tty, name) >= 0;
410	}
411
412	bool
413	rxvt_ptytty::get ()	460	rxvt_ptytty_unix::get ()
414	{	461	{
415	/* get master (pty) */	462	/* get master (pty) */
416	if ((pty = get_pty (&tty, &name)) < 0)	463	if ((pty = get_pty (&tty, &name)) < 0)
417	return false;	464	return false;
418		465
…		…
433	}	480	}
434		481
435	return true;	482	return true;
436	}	483	}
437		484
		485	#if PTYTTY_HELPER
		486
		487	static int sock_fd;
		488	static int pid;
		489
		490	struct command
		491	{
		492	enum { get, login, destroy } type;
		493
		494	rxvt_ptytty *id;
		495
		496	bool login_shell;
		497	int cmd_pid;
		498	char hostname[512]; // arbitrary, but should be plenty
		499	};
		500
		501	struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
		502	{
		503	rxvt_ptytty *id;
		504
		505	~rxvt_ptytty_proxy ();
		506
		507	bool get ();
		508	void login (int cmd_pid, bool login_shell, const char *hostname);
		509	};
		510
		511	bool
		512	rxvt_ptytty_proxy::get ()
		513	{
		514	command cmd;
		515
		516	cmd.type = command::get;
		517
		518	write (sock_fd, &cmd, sizeof (cmd));
		519
		520	if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
		521	rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
		522
		523	if (!id)
		524	return false;
		525
		526	if ((pty = rxvt_recv_fd (sock_fd)) < 0
		527	\|\| (tty = rxvt_recv_fd (sock_fd)) < 0)
		528	rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
		529
		530	return true;
		531	}
		532
438	void	533	void
439	rxvt_ptytty::set_utf8_mode (bool on)	534	rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
440	{	535	{
441	#ifdef IUTF8	536	command cmd;
442	if (pty < 0)
443	return;
444		537
445	struct termios tio;	538	cmd.type = command::login;
		539	cmd.id = id;
		540	cmd.cmd_pid = cmd_pid;
		541	cmd.login_shell = login_shell;
		542	strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
446		543
447	if (tcgetattr (pty, &tio) != -1)	544	write (sock_fd, &cmd, sizeof (cmd));
448	{	545	}
449	tcflag_t new_cflag = tio.c_iflag;
450		546
451	if (on)	547	rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
452	new_cflag \|= IUTF8;	548	{
		549	command cmd;
		550
		551	cmd.type = command::destroy;
		552	cmd.id = id;
		553
		554	write (sock_fd, &cmd, sizeof (cmd));
		555	}
		556
		557	static
		558	void serve ()
		559	{
		560	command cmd;
		561	vector<rxvt_ptytty *> ptys;
		562
		563	while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
		564	{
		565	if (cmd.type == command::get)
		566	{
		567	// -> id ptyfd ttyfd
		568	cmd.id = new rxvt_ptytty_unix;
		569
		570	if (cmd.id->get ())
		571	{
		572	write (sock_fd, &cmd.id, sizeof (cmd.id));
		573	ptys.push_back (cmd.id);
		574
		575	rxvt_send_fd (sock_fd, cmd.id->pty);
		576	rxvt_send_fd (sock_fd, cmd.id->tty);
		577	}
		578	else
		579	{
		580	delete cmd.id;
		581	cmd.id = 0;
		582	write (sock_fd, &cmd.id, sizeof (cmd.id));
		583	}
		584	}
		585	else if (cmd.type == command::login)
		586	{
		587	#if UTMP_SUPPORT
		588	if (find (ptys.begin (), ptys.end (), cmd.id))
		589	{
		590	cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
		591	cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
		592	}
		593	#endif
		594	}
		595	else if (cmd.type == command::destroy)
		596	{
		597	rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
		598
		599	if (pty)
		600	{
		601	delete *pty;
		602	ptys.erase (pty);
		603	}
		604	}
453	else	605	else
454	new_cflag &= ~IUTF8;	606	break;
		607	}
455		608
456	if (new_cflag != tio.c_iflag)	609	// destroy all ptys
457	{	610	for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
458	tio.c_iflag = new_cflag;	611	delete *i;
459	tcsetattr (pty, TCSANOW, &tio);	612	}
460	}	613
		614	void rxvt_ptytty_server ()
		615	{
		616	int sv[2];
		617
		618	if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
		619	rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
		620
		621	pid = fork ();
		622
		623	if (pid < 0)
		624	rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
		625
		626	if (pid)
461	}	627	{
		628	// client, urxvt
		629	sock_fd = sv[0];
		630	close (sv[1]);
		631	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
		632	}
		633	else
		634	{
		635	setgid (getegid ());
		636	setuid (geteuid ());
		637
		638	// server, pty-helper
		639	sock_fd = sv[1];
		640
		641	for (int fd = 0; fd < 1023; fd++)
		642	if (fd != sock_fd && fd != 1)
		643	close (fd);
		644
		645	serve ();
		646	_exit (EXIT_SUCCESS);
		647	}
		648	}
462	#endif	649	#endif
		650
		651	// a "factory" g
		652	rxvt_ptytty *
		653	rxvt_new_ptytty ()
		654	{
		655	#if PTYTTY_HELPER
		656	if (pid > 0)
		657	// use helper process
		658	return new rxvt_ptytty_proxy;
		659	else
		660	#endif
		661	return new rxvt_ptytty_unix;
463	}	662	}
464		663
465	/----------------------- end-of-file (C source) -----------------------/	664	/----------------------- end-of-file (C source) -----------------------/
466		665

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.44 by ayin, Tue Jan 17 17:59:31 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.44 by ayin, Tue Jan 17 17:59:31 2006 UTC