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

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

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.32 by root, Wed Jan 11 20:46:46 2006 UTC vs. Revision 1.45 by root, Tue Jan 17 18:06:14 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.32 by root, Wed Jan 11 20:46:46 2006 UTC vs.
Revision 1.45 by root, Tue Jan 17 18:06:14 2006 UTC