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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.55 by root, Sun Jan 22 01:00:46 2006 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs. Revision 1.55 by root, Sun Jan 22 01:00:46 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.55 by root, Sun Jan 22 01:00:46 2006 UTC