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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC vs.
Revision 1.48 by ayin, Thu Jan 19 10:44:44 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	#ifdef NO_SETOWNER_TTYDEV
72	int pfd;	73	int pfd;
73		74
		75	# if defined(PTYS_ARE_GETPT)
		76	pfd = getpt();
		77	# elif defined(PTYS_ARE_POSIX)
		78	pfd = posix_openpt (O_RDWR);
		79	# else
		80	pfd = open ("/dev/ptmx", 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	}
		90
		91	close (pfd);
		92	}
		93	#endif
		94
		95	return -1;
		96	}
		97
		98	static inline int
		99	get_pty_openpty (int fd_tty, char *ttydev)
		100	{
74	#ifdef PTYS_ARE_OPENPTY	101	#ifdef PTYS_ARE_OPENPTY
		102	int pfd;
		103	int res;
75	char tty_name[sizeof "/dev/pts/????\0"];	104	char tty_name[sizeof "/dev/pts/????\0"];
76		105
77	rxvt_privileges(RESTORE);
78	int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);	106	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79	rxvt_privileges(IGNORE);
80
81	if (res != -1)	107	if (res != -1)
82	{	108	{
83	*ttydev = strdup (tty_name);	109	*ttydev = strdup (tty_name);
84	return pfd;	110	return pfd;
85	}	111	}
86	#endif	112	#endif
87		113
		114	return -1;
		115	}
		116
		117	static inline int
		118	get_pty__getpty (int fd_tty, char *ttydev)
		119	{
88	#ifdef PTYS_ARE__GETPTY	120	#ifdef PTYS_ARE__GETPTY
		121	int pfd;
		122
89	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	123	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
90	if (*ttydev != NULL)	124	if (*ttydev != NULL)
91	return pfd;	125	return pfd;
92	#endif	126	#endif
93		127
94	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	128	return -1;
95	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)	129	}
96		130
97	{	131	static inline int
98	# ifdef PTYS_ARE_GETPT	132	get_pty_ptc (int fd_tty, char *ttydev)
99	pfd = getpt();	133	{
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	134	#ifdef PTYS_ARE_PTC
		135	int pfd;
		136
123	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	137	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
124	{	138	{
125	*ttydev = strdup (ttyname (pfd));	139	*ttydev = strdup (ttyname (pfd));
126	return pfd;	140	return pfd;
127	}	141	}
128	#endif	142	#endif
129		143
		144	return -1;
		145	}
		146
		147	static inline int
		148	get_pty_clone (int fd_tty, char *ttydev)
		149	{
130	#ifdef PTYS_ARE_CLONE	150	#ifdef PTYS_ARE_CLONE
		151	int pfd;
		152
131	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)	153	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)
132	{	154	{
133	*ttydev = strdup (ptsname (pfd));	155	*ttydev = strdup (ptsname (pfd));
134	return pfd;	156	return pfd;
135	}	157	}
136	#endif	158	#endif
137		159
		160	return -1;
		161	}
		162
		163	static inline int
		164	get_pty_numeric (int fd_tty, char *ttydev)
		165	{
138	#ifdef PTYS_ARE_NUMERIC	166	#ifdef PTYS_ARE_NUMERIC
139	{	167	int pfd;
140	int idx;	168	int idx;
141	char c1, c2;	169	char c1, c2;
142	char pty_name[] = "/dev/ptyp???";	170	char pty_name[] = "/dev/ptyp???";
143	char tty_name[] = "/dev/ttyp???";	171	char tty_name[] = "/dev/ttyp???";
144		172
145	c1 = &(pty_name[sizeof (pty_name) - 4]);	173	c1 = &(pty_name[sizeof (pty_name) - 4]);
146	c2 = &(tty_name[sizeof (tty_name) - 4]);	174	c2 = &(tty_name[sizeof (tty_name) - 4]);
		175
147	for (idx = 0; idx < 256; idx++)	176	for (idx = 0; idx < 256; idx++)
148	{	177	{
149	sprintf (c1, "%d", idx);	178	sprintf (c1, "%d", idx);
150	sprintf (c2, "%d", idx);	179	sprintf (c2, "%d", idx);
		180
151	if (access (tty_name, F_OK) < 0)	181	if (access (tty_name, F_OK) < 0)
152	{	182	{
153	idx = 256;	183	idx = 256;
154	break;	184	break;
155	}	185	}
156		186
157	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)	187	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
158	{	188	{
159	if (access (tty_name, R_OK \| W_OK) == 0)	189	if (access (tty_name, R_OK \| W_OK) == 0)
160	{	190	{
161	*ttydev = strdup (tty_name);	191	*ttydev = strdup (tty_name);
162	return pfd;	192	return pfd;
163	}	193	}
164		194
165	close (pfd);	195	close (pfd);
166	}	196	}
167	}	197	}
168	}
169	#endif	198	#endif
170		199
		200	return -1;
		201	}
		202
		203	static inline int
		204	get_pty_searched (int fd_tty, char *ttydev)
		205	{
171	#ifdef PTYS_ARE_SEARCHED	206	#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	207	# ifndef PTYCHAR1
178	# define PTYCHAR1 "pqrstuvwxyz"	208	# define PTYCHAR1 "pqrstuvwxyz"
179	# endif	209	# endif
180	# ifndef PTYCHAR2	210	# ifndef PTYCHAR2
181	# define PTYCHAR2 "0123456789abcdef"	211	# define PTYCHAR2 "0123456789abcdef"
182	# endif	212	# endif
		213	int pfd;
		214	const char c1, c2;
		215	char pty_name[] = "/dev/pty??";
		216	char tty_name[] = "/dev/tty??";
183		217
184	for (c1 = PTYCHAR1; *c1; c1++)	218	for (c1 = PTYCHAR1; *c1; c1++)
185	{	219	{
186	pty_name[ (sizeof (pty_name) - 3)] =	220	pty_name[ (sizeof (pty_name) - 3)] =
187	tty_name[ (sizeof (pty_name) - 3)] = *c1;	221	tty_name[ (sizeof (pty_name) - 3)] = *c1;
		222
188	for (c2 = PTYCHAR2; *c2; c2++)	223	for (c2 = PTYCHAR2; *c2; c2++)
189	{	224	{
190	pty_name[ (sizeof (pty_name) - 2)] =	225	pty_name[ (sizeof (pty_name) - 2)] =
191	tty_name[ (sizeof (pty_name) - 2)] = *c2;	226	tty_name[ (sizeof (pty_name) - 2)] = *c2;
		227
192	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)	228	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
193	{	229	{
194	if (access (tty_name, R_OK \| W_OK) == 0)	230	if (access (tty_name, R_OK \| W_OK) == 0)
195	{	231	{
196	*ttydev = strdup (tty_name);	232	*ttydev = strdup (tty_name);
197	return pfd;	233	return pfd;
198	}	234	}
199		235
200	close (pfd);	236	close (pfd);
201	}	237	}
202	}	238	}
203	}	239	}
204	}
205	#endif	240	#endif
		241
		242	return -1;
		243	}
		244
		245	static int
		246	get_pty (int fd_tty, char *ttydev)
		247	{
		248	int pfd;
		249
		250	if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
		251	\|\| (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
		252	\|\| (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
		253	\|\| (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
		254	\|\| (pfd = get_pty_clone (fd_tty, ttydev)) != -1
		255	\|\| (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
		256	\|\| (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
		257	return pfd;
206		258
207	return -1;	259	return -1;
208	}	260	}
209		261
210	/----------------------------------------------------------------------/	262	/----------------------------------------------------------------------/
…		…
222	* Make our tty a controlling tty so that /dev/tty points to us	274	* Make our tty a controlling tty so that /dev/tty points to us
223	*/	275	*/
224	static int	276	static int
225	control_tty (int fd_tty)	277	control_tty (int fd_tty)
226	{	278	{
227	#ifndef __QNX__
228	int fd;
229
230	/* ---------------------------------------- */
231	# ifdef HAVE_SETSID
232	setsid ();	279	setsid ();
233	# endif
234	# if defined(HAVE_SETPGID)
235	setpgid (0, 0);
236	# elif defined(HAVE_SETPGRP)
237	setpgrp (0, 0);
238	# endif
239		280
240	/* ---------------------------------------- */
241	# ifdef TIOCNOTTY
242	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
243	if (fd >= 0)
244	{
245	ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
246	close (fd);
247	}
248	# endif
249
250	/* ---------------------------------------- */
251	fd = open ("/dev/tty", O_RDWR \| O_NOCTTY);
252	if (fd >= 0)
253	close (fd); /* ouch: still have controlling tty */
254
255	/* ---------------------------------------- */
256	# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)	281	#if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
257	/*	282	/*
258	* Push STREAMS modules:	283	* Push STREAMS modules:
259	* ptem: pseudo-terminal hardware emulation module.	284	* ptem: pseudo-terminal hardware emulation module.
260	* ldterm: standard terminal line discipline.	285	* ldterm: standard terminal line discipline.
261	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.	286	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
…		…
269	* documentation is really unclear about whether it is any close () on	294	* documentation is really unclear about whether it is any close () on
270	* the master side or the last close () - i.e. a proper STREAMS dismantling	295	* the master side or the last close () - i.e. a proper STREAMS dismantling
271	* close () - on the master side which causes a hang up to be sent	296	* close () - on the master side which causes a hang up to be sent
272	* through - Geoff Wing	297	* through - Geoff Wing
273	*/	298	*/
274	# ifdef HAVE_ISASTREAM	299	# ifdef HAVE_ISASTREAM
275	if (isastream (fd_tty) == 1)	300	if (isastream (fd_tty) == 1)
276	# endif	301	# endif
277	{	302	{
278	ioctl (fd_tty, I_PUSH, "ptem");	303	ioctl (fd_tty, I_PUSH, "ptem");
279	ioctl (fd_tty, I_PUSH, "ldterm");	304	ioctl (fd_tty, I_PUSH, "ldterm");
280	ioctl (fd_tty, I_PUSH, "ttcompat");	305	ioctl (fd_tty, I_PUSH, "ttcompat");
281	}	306	}
282	# endif	307	#endif
283	/* ---------------------------------------- */	308
284	fd = ioctl (fd_tty, TIOCSCTTY, NULL);	309	ioctl (fd_tty, TIOCSCTTY, NULL);
285	/* ---------------------------------------- */	310
286	fd = open ("/dev/tty", O_WRONLY);	311	int fd = open ("/dev/tty", O_WRONLY);
287	if (fd < 0)	312	if (fd < 0)
288	return -1; /* fatal */	313	return -1; /* fatal */
		314
289	close (fd);	315	close (fd);
290	/* ---------------------------------------- */
291	#endif /* ! __QNX__ */
292		316
293	return 0;	317	return 0;
294	}	318	}
295		319
296	void	320	void
…		…
355	}	379	}
356	else	380	else
357	#endif /* TTY_GID_SUPPORT */	381	#endif /* TTY_GID_SUPPORT */
358	{	382	{
359	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;	383	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;
360	gid = getgid ();	384	gid = 0;
361	}	385	}
362	}	386	}
363	} ttyconf;	387	} ttyconf;
364		388
365	/////////////////////////////////////////////////////////////////////////////	389	/////////////////////////////////////////////////////////////////////////////
…		…
368	rxvt_ptytty_unix::privileges (rxvt_privaction action)	392	rxvt_ptytty_unix::privileges (rxvt_privaction action)
369	{	393	{
370	if (!name \|\| !*name)	394	if (!name \|\| !*name)
371	return;	395	return;
372		396
373	rxvt_privileges (RESTORE);
374
375	if (action == SAVE)	397	if (action == SAVE)
376	{	398	{
377	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	399	chown (name, getuid (), ttyconf.gid); /* fail silently */
378	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */	400	chmod (name, ttyconf.mode);
379	if (lstat (name, &savestat) < 0) /* you lose out */	401	# ifdef HAVE_REVOKE
380	;	402	revoke (name);
381	else
382	# endif	403	# endif
383	{
384	saved = true;
385	chown (name, getuid (), ttyconf.gid); /* fail silently */
386	chmod (name, ttyconf.mode);
387	# ifdef HAVE_REVOKE
388	revoke (name);
389	# endif
390	}
391	}	404	}
392	else	405	else
393	{ /* action == RESTORE */	406	{ /* action == RESTORE */
394	# ifndef RESET_TTY_TO_COMMON_DEFAULTS	407	chmod (name, RESTORE_TTY_MODE);
395	if (saved)
396	{
397	chmod (name, savestat.st_mode);
398	chown (name, savestat.st_uid, savestat.st_gid);
399	}
400	# else
401	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
402	chown (name, 0, 0);	408	chown (name, 0, ttyconf.gid);
403	# endif
404
405	}	409	}
406
407	rxvt_privileges (IGNORE);
408	}	410	}
409	#endif	411	#endif
410		412
411	rxvt_ptytty_unix::rxvt_ptytty_unix ()	413	rxvt_ptytty_unix::rxvt_ptytty_unix ()
412	{	414	{
413	pty = tty = -1;	415	pty = tty = -1;
414	name = 0;	416	name = 0;
415	#ifndef NO_SETOWNER_TTYDEV
416	saved = false;
417	#endif
418	#if UTMP_SUPPORT	417	#if UTMP_SUPPORT
419	cmd_pid = 0;	418	cmd_pid = 0;
420	#endif	419	#endif
421	}	420	}
422		421
423	rxvt_ptytty_unix::~rxvt_ptytty_unix ()	422	rxvt_ptytty_unix::~rxvt_ptytty_unix ()
424	{	423	{
		424	#if UTMP_SUPPORT
425	logout ();	425	logout ();
		426	#endif
426	put ();	427	put ();
427	}	428	}
428		429
429	void	430	void
430	rxvt_ptytty_unix::put ()	431	rxvt_ptytty_unix::put ()
…		…
465	}	466	}
466		467
467	return true;	468	return true;
468	}	469	}
469		470
		471	#if PTYTTY_HELPER
		472
		473	static int sock_fd;
		474	static int pid;
		475
		476	struct command
		477	{
		478	enum { get, login, destroy } type;
		479
		480	rxvt_ptytty *id;
		481
		482	bool login_shell;
		483	int cmd_pid;
		484	char hostname[512]; // arbitrary, but should be plenty
		485	};
		486
		487	struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
		488	{
		489	rxvt_ptytty *id;
		490
		491	~rxvt_ptytty_proxy ();
		492
		493	bool get ();
		494	void login (int cmd_pid, bool login_shell, const char *hostname);
		495	};
		496
		497	bool
		498	rxvt_ptytty_proxy::get ()
		499	{
		500	command cmd;
		501
		502	cmd.type = command::get;
		503
		504	write (sock_fd, &cmd, sizeof (cmd));
		505
		506	if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
		507	rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
		508
		509	if (!id)
		510	return false;
		511
		512	if ((pty = rxvt_recv_fd (sock_fd)) < 0
		513	\|\| (tty = rxvt_recv_fd (sock_fd)) < 0)
		514	rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
		515
		516	return true;
		517	}
		518
		519	void
		520	rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
		521	{
		522	command cmd;
		523
		524	cmd.type = command::login;
		525	cmd.id = id;
		526	cmd.cmd_pid = cmd_pid;
		527	cmd.login_shell = login_shell;
		528	strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
		529
		530	write (sock_fd, &cmd, sizeof (cmd));
		531	}
		532
		533	rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
		534	{
		535	command cmd;
		536
		537	cmd.type = command::destroy;
		538	cmd.id = id;
		539
		540	write (sock_fd, &cmd, sizeof (cmd));
		541	}
		542
		543	static
		544	void serve ()
		545	{
		546	command cmd;
		547	vector<rxvt_ptytty *> ptys;
		548
		549	while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
		550	{
		551	if (cmd.type == command::get)
		552	{
		553	// -> id ptyfd ttyfd
		554	cmd.id = new rxvt_ptytty_unix;
		555
		556	if (cmd.id->get ())
		557	{
		558	write (sock_fd, &cmd.id, sizeof (cmd.id));
		559	ptys.push_back (cmd.id);
		560
		561	rxvt_send_fd (sock_fd, cmd.id->pty);
		562	rxvt_send_fd (sock_fd, cmd.id->tty);
		563	}
		564	else
		565	{
		566	delete cmd.id;
		567	cmd.id = 0;
		568	write (sock_fd, &cmd.id, sizeof (cmd.id));
		569	}
		570	}
		571	else if (cmd.type == command::login)
		572	{
		573	#if UTMP_SUPPORT
		574	if (find (ptys.begin (), ptys.end (), cmd.id))
		575	{
		576	cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
		577	cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
		578	}
		579	#endif
		580	}
		581	else if (cmd.type == command::destroy)
		582	{
		583	rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
		584
		585	if (pty)
		586	{
		587	delete *pty;
		588	ptys.erase (pty);
		589	}
		590	}
		591	else
		592	break;
		593	}
		594
		595	// destroy all ptys
		596	for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
		597	delete *i;
		598	}
		599
		600	void rxvt_ptytty_server ()
		601	{
		602	int sv[2];
		603
		604	if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
		605	rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
		606
		607	pid = fork ();
		608
		609	if (pid < 0)
		610	rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
		611
		612	if (pid)
		613	{
		614	// client, urxvt
		615	sock_fd = sv[0];
		616	close (sv[1]);
		617	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
		618	}
		619	else
		620	{
		621	// server, pty-helper
		622	sock_fd = sv[1];
		623
		624	for (int fd = 0; fd < 1023; fd++)
		625	if (fd != sock_fd)
		626	close (fd);
		627
		628	serve ();
		629	_exit (EXIT_SUCCESS);
		630	}
		631	}
		632	#endif
		633
		634	// a "factory" g
		635	rxvt_ptytty *
		636	rxvt_new_ptytty ()
		637	{
		638	#if PTYTTY_HELPER
		639	if (pid > 0)
		640	// use helper process
		641	return new rxvt_ptytty_proxy;
		642	else
		643	#endif
		644	return new rxvt_ptytty_unix;
		645	}
		646
470	/----------------------- end-of-file (C source) -----------------------/	647	/----------------------- end-of-file (C source) -----------------------/
471		648

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC vs. Revision 1.48 by ayin, Thu Jan 19 10:44:44 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC vs.
Revision 1.48 by ayin, Thu Jan 19 10:44:44 2006 UTC