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

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC vs.
Revision 1.53 by ayin, Sat Jan 21 18:15:26 2006 UTC

…		…
33	#include <fcntl.h>	33	#include <fcntl.h>
34		34
35	#ifdef HAVE_SYS_IOCTL_H	35	#ifdef HAVE_SYS_IOCTL_H
36	# include <sys/ioctl.h>	36	# include <sys/ioctl.h>
37	#endif	37	#endif
38	#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)	38	#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39	# include <sys/stropts.h> /* for I_PUSH */	39	# include <sys/stropts.h> /* for I_PUSH */
40	#endif	40	#endif
41	#ifdef HAVE_ISASTREAM	41	#ifdef HAVE_ISASTREAM
42	# include <stropts.h>	42	# include <stropts.h>
43	#endif	43	#endif
…		…
46	#elif defined(HAVE_LIBUTIL_H)	46	#elif defined(HAVE_LIBUTIL_H)
47	# include <libutil.h>	47	# include <libutil.h>
48	#elif defined(HAVE_UTIL_H)	48	#elif defined(HAVE_UTIL_H)
49	# include <util.h>	49	# include <util.h>
50	#endif	50	#endif
		51	#ifdef TTY_GID_SUPPORT
		52	#include <grp.h>
		53	#endif
51		54
52	#include <cstdio>	55	#include <cstdio>
53	#include <grp.h>
54		56
55	#include "rxvtutil.h"	57	#include "rxvtutil.h"
56	#include "fdpass.h"	58	#include "fdpass.h"
57	#include "ptytty.h"	59	#include "ptytty.h"
58		60
…		…
64	/*	66	/*
65	* Returns pty file descriptor, or -1 on failure	67	* Returns pty file descriptor, or -1 on failure
66	* If successful, ttydev is set to the name of the slave device.	68	* 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	69	* fd_tty _may_ also be set to an open fd to the slave device
68	*/	70	*/
		71	#if defined(UNIX98_PTY)
69	static int	72	static int
70	get_pty (int fd_tty, char *ttydev)	73	get_pty (int fd_tty, char *ttydev)
71	{	74	{
72	int pfd;	75	int pfd;
73		76
74	#ifdef PTYS_ARE_OPENPTY	77	# if defined(HAVE_GETPT)
75	char tty_name[sizeof "/dev/pts/????\0"];	78	pfd = getpt();
		79	# elif defined(HAVE_POSIX_OPENPT)
		80	pfd = posix_openpt (O_RDWR);
		81	# else
		82	pfd = open (CLONE_DEVICE, O_RDWR \| O_NOCTTY, 0);
		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	}
76		92
		93	close (pfd);
		94	}
		95
		96	return -1;
		97	}
		98	#elif defined(HAVE_OPENPTY)
		99	static int
		100	get_pty (int fd_tty, char *ttydev)
		101	{
		102	int pfd;
		103	int res;
		104	char tty_name[32];
		105
77	int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);	106	res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
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
85		112
86	#ifdef PTYS_ARE__GETPTY	113	return -1;
		114	}
		115	#elif defined(HAVE__GETPTY)
		116	static int
		117	get_pty (int fd_tty, char *ttydev)
		118	{
		119	int pfd;
		120
87	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);	121	*ttydev = _getpty (&pfd, O_RDWR \| O_NONBLOCK \| O_NOCTTY, 0622, 0);
88	if (*ttydev != NULL)	122	if (*ttydev != NULL)
89	return pfd;	123	return pfd;
90	#endif
91		124
92	#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)	125	return -1;
93	# if defined(PTYS_ARE_GETPT) \|\| defined(PTYS_ARE_POSIX) \|\| defined(PTYS_ARE_PTMX)	126	}
		127	#elif defined(HAVE_DEV_PTC)
		128	static int
		129	get_pty (int fd_tty, char *ttydev)
		130	{
		131	int pfd;
94		132
95	{
96	# ifdef PTYS_ARE_GETPT
97	pfd = getpt();
98	# else
99	# ifdef PTYS_ARE_POSIX
100	pfd = posix_openpt (O_RDWR);
101	# else
102	pfd = open ("/dev/ptmx", O_RDWR \| O_NOCTTY, 0);
103	# endif
104	# endif
105
106	if (pfd >= 0)
107	{
108	if (grantpt (pfd) == 0 /* change slave permissions */
109	&& unlockpt (pfd) == 0)
110	{ /* slave now unlocked */
111	ttydev = strdup (ptsname (pfd)); / get slave's name */
112	return pfd;
113	}
114	close (pfd);
115	}
116	}
117	# endif
118	#endif
119
120	#ifdef PTYS_ARE_PTC
121	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)	133	if ((pfd = open ("/dev/ptc", O_RDWR \| O_NOCTTY, 0)) >= 0)
122	{	134	{
123	*ttydev = strdup (ttyname (pfd));	135	*ttydev = strdup (ttyname (pfd));
124	return pfd;	136	return pfd;
125	}	137	}
126	#endif
127		138
128	#ifdef PTYS_ARE_CLONE	139	return -1;
		140	}
		141	#elif defined(HAVE_DEV_CLONE)
		142	static int
		143	get_pty (int fd_tty, char *ttydev)
		144	{
		145	int pfd;
		146
129	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)	147	if ((pfd = open ("/dev/ptym/clone", O_RDWR \| O_NOCTTY, 0)) >= 0)
130	{	148	{
131	*ttydev = strdup (ptsname (pfd));	149	*ttydev = strdup (ptsname (pfd));
132	return pfd;	150	return pfd;
133	}	151	}
134	#endif
135
136	#ifdef PTYS_ARE_NUMERIC
137	{
138	int idx;
139	char c1, c2;
140	char pty_name[] = "/dev/ptyp???";
141	char tty_name[] = "/dev/ttyp???";
142
143	c1 = &(pty_name[sizeof (pty_name) - 4]);
144	c2 = &(tty_name[sizeof (tty_name) - 4]);
145	for (idx = 0; idx < 256; idx++)
146	{
147	sprintf (c1, "%d", idx);
148	sprintf (c2, "%d", idx);
149	if (access (tty_name, F_OK) < 0)
150	{
151	idx = 256;
152	break;
153	}
154
155	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
156	{
157	if (access (tty_name, R_OK \| W_OK) == 0)
158	{
159	*ttydev = strdup (tty_name);
160	return pfd;
161	}
162
163	close (pfd);
164	}
165	}
166	}
167	#endif
168
169	#ifdef PTYS_ARE_SEARCHED
170	{
171	const char c1, c2;
172	char pty_name[] = "/dev/pty??";
173	char tty_name[] = "/dev/tty??";
174
175	# ifndef PTYCHAR1
176	# define PTYCHAR1 "pqrstuvwxyz"
177	# endif
178	# ifndef PTYCHAR2
179	# define PTYCHAR2 "0123456789abcdef"
180	# endif
181
182	for (c1 = PTYCHAR1; *c1; c1++)
183	{
184	pty_name[ (sizeof (pty_name) - 3)] =
185	tty_name[ (sizeof (pty_name) - 3)] = *c1;
186	for (c2 = PTYCHAR2; *c2; c2++)
187	{
188	pty_name[ (sizeof (pty_name) - 2)] =
189	tty_name[ (sizeof (pty_name) - 2)] = *c2;
190	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) >= 0)
191	{
192	if (access (tty_name, R_OK \| W_OK) == 0)
193	{
194	*ttydev = strdup (tty_name);
195	return pfd;
196	}
197
198	close (pfd);
199	}
200	}
201	}
202	}
203	#endif
204		152
205	return -1;	153	return -1;
206	}	154	}
		155	#else
		156	/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
		157	static int
		158	get_pty (int fd_tty, char *ttydev)
		159	{
		160	int pfd;
		161	int i;
		162	char pty_name[32];
		163	char tty_name[32];
		164	const char *majors = "pqrstuvwxyzabcde";
		165	const char *minors = "0123456789abcdef";
		166	for (i = 0; i < 256; i++)
		167	{
		168	snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
		169	snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
		170	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) == -1)
		171	{
		172	snprintf(pty_name, 32, "/dev/ptyp%d", i);
		173	snprintf(tty_name, 32, "/dev/ttyp%d", i);
		174	if ((pfd = open (pty_name, O_RDWR \| O_NOCTTY, 0)) == -1)
		175	continue;
		176	}
		177	if (access (tty_name, R_OK \| W_OK) == 0)
		178	{
		179	*ttydev = strdup (tty_name);
		180	return pfd;
		181	}
		182
		183	close (pfd);
		184	}
		185	}
		186	#endif
207		187
208	/----------------------------------------------------------------------/	188	/----------------------------------------------------------------------/
209	/*	189	/*
210	* Returns tty file descriptor, or -1 on failure	190	* Returns tty file descriptor, or -1 on failure
211	*/	191	*/
…		…
220	* Make our tty a controlling tty so that /dev/tty points to us	200	* Make our tty a controlling tty so that /dev/tty points to us
221	*/	201	*/
222	static int	202	static int
223	control_tty (int fd_tty)	203	control_tty (int fd_tty)
224	{	204	{
225	int fd;
226
227	/* ---------------------------------------- */
228	setsid ();	205	setsid ();
229		206
230	/* ---------------------------------------- */
231	# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)	207	#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
232	/*	208	/*
233	* Push STREAMS modules:	209	* Push STREAMS modules:
234	* ptem: pseudo-terminal hardware emulation module.	210	* ptem: pseudo-terminal hardware emulation module.
235	* ldterm: standard terminal line discipline.	211	* ldterm: standard terminal line discipline.
236	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.	212	* ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
…		…
244	* documentation is really unclear about whether it is any close () on	220	* documentation is really unclear about whether it is any close () on
245	* the master side or the last close () - i.e. a proper STREAMS dismantling	221	* the master side or the last close () - i.e. a proper STREAMS dismantling
246	* close () - on the master side which causes a hang up to be sent	222	* close () - on the master side which causes a hang up to be sent
247	* through - Geoff Wing	223	* through - Geoff Wing
248	*/	224	*/
249	# ifdef HAVE_ISASTREAM	225	# ifdef HAVE_ISASTREAM
250	if (isastream (fd_tty) == 1)	226	if (isastream (fd_tty) == 1)
251	# endif	227	# endif
252	{	228	{
253	ioctl (fd_tty, I_PUSH, "ptem");	229	ioctl (fd_tty, I_PUSH, "ptem");
254	ioctl (fd_tty, I_PUSH, "ldterm");	230	ioctl (fd_tty, I_PUSH, "ldterm");
255	ioctl (fd_tty, I_PUSH, "ttcompat");	231	ioctl (fd_tty, I_PUSH, "ttcompat");
256	}	232	}
257	# endif	233	#endif
258	/* ---------------------------------------- */	234
259	fd = ioctl (fd_tty, TIOCSCTTY, NULL);	235	ioctl (fd_tty, TIOCSCTTY, NULL);
260	/* ---------------------------------------- */	236
261	fd = open ("/dev/tty", O_WRONLY);	237	int fd = open ("/dev/tty", O_WRONLY);
262	if (fd < 0)	238	if (fd < 0)
263	return -1; /* fatal */	239	return -1; /* fatal */
		240
264	close (fd);	241	close (fd);
265	/* ---------------------------------------- */
266		242
267	return 0;	243	return 0;
268	}	244	}
269		245
270	void	246	void
…		…
308	}	284	}
309	}	285	}
310	#endif	286	#endif
311	}	287	}
312		288
313	/////////////////////////////////////////////////////////////////////////////
314
315	#ifndef NO_SETOWNER_TTYDEV
316	static struct ttyconf {	289	static struct ttyconf {
317	gid_t gid;	290	gid_t gid;
318	mode_t mode;	291	mode_t mode;
319		292
320	ttyconf ()	293	ttyconf ()
…		…
329	}	302	}
330	else	303	else
331	#endif /* TTY_GID_SUPPORT */	304	#endif /* TTY_GID_SUPPORT */
332	{	305	{
333	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;	306	mode = S_IRUSR \| S_IWUSR \| S_IWGRP \| S_IWOTH;
334	gid = getgid ();	307	gid = 0;
335	}	308	}
336	}	309	}
337	} ttyconf;	310	} ttyconf;
338		311
339	/////////////////////////////////////////////////////////////////////////////
340
341	void
342	rxvt_ptytty_unix::privileges (rxvt_privaction action)
343	{
344	if (!name \|\| !*name)
345	return;
346
347	if (action == SAVE)
348	{
349	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
350	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
351	if (lstat (name, &savestat) < 0) /* you lose out */
352	;
353	else
354	# endif
355	{
356	saved = true;
357	chown (name, getuid (), ttyconf.gid); /* fail silently */
358	chmod (name, ttyconf.mode);
359	# ifdef HAVE_REVOKE
360	revoke (name);
361	# endif
362	}
363	}
364	else
365	{ /* action == RESTORE */
366	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
367	if (saved)
368	{
369	chmod (name, savestat.st_mode);
370	chown (name, savestat.st_uid, savestat.st_gid);
371	}
372	# else
373	chmod (name, (S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
374	chown (name, 0, 0);
375	# endif
376
377	}
378	}
379	#endif
380
381	rxvt_ptytty_unix::rxvt_ptytty_unix ()	312	rxvt_ptytty_unix::rxvt_ptytty_unix ()
382	{	313	{
383	pty = tty = -1;
384	name = 0;	314	name = 0;
385	#ifndef NO_SETOWNER_TTYDEV
386	saved = false;
387	#endif
388	#if UTMP_SUPPORT	315	#if UTMP_SUPPORT
389	cmd_pid = 0;	316	cmd_pid = 0;
390	#endif	317	#endif
391	}	318	}
392		319
…		…
399	}	326	}
400		327
401	void	328	void
402	rxvt_ptytty_unix::put ()	329	rxvt_ptytty_unix::put ()
403	{	330	{
404	#ifndef NO_SETOWNER_TTYDEV	331	chmod (name, RESTORE_TTY_MODE);
405	privileges (RESTORE);	332	chown (name, 0, ttyconf.gid);
406	#endif
407		333
408	if (pty >= 0) close (pty);
409	close_tty ();	334	close_tty ();
		335
		336	if (pty >= 0)
		337	close (pty);
		338
410	free (name);	339	free (name);
411		340
412	pty = tty = -1;	341	pty = tty = -1;
413	name = 0;	342	name = 0;
414	}	343	}
…		…
424		353
425	/* get slave (tty) */	354	/* get slave (tty) */
426	if (tty < 0)	355	if (tty < 0)
427	{	356	{
428	#ifndef NO_SETOWNER_TTYDEV	357	#ifndef NO_SETOWNER_TTYDEV
429	privileges (SAVE);	358	chown (name, getuid (), ttyconf.gid); /* fail silently */
		359	chmod (name, ttyconf.mode);
		360	# ifdef HAVE_REVOKE
		361	revoke (name);
		362	# endif
430	#endif	363	#endif
431		364
432	if ((tty = get_tty (name)) < 0)	365	if ((tty = get_tty (name)) < 0)
433	{	366	{
434	put ();	367	put ();
…		…
587	close (sv[1]);	520	close (sv[1]);
588	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);	521	fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
589	}	522	}
590	else	523	else
591	{	524	{
592	setgid (getegid ());
593	setuid (geteuid ());
594
595	// server, pty-helper	525	// server, pty-helper
596	sock_fd = sv[1];	526	sock_fd = sv[1];
597		527
598	for (int fd = 0; fd < 1023; fd++)	528	for (int fd = 0; fd < 1023; fd++)
599	if (fd != sock_fd && fd != 1)	529	if (fd != sock_fd)
600	close (fd);	530	close (fd);
601		531
602	serve ();	532	serve ();
603	_exit (EXIT_SUCCESS);	533	_exit (EXIT_SUCCESS);
604	}	534	}
605	}	535	}
		536
606	#endif	537	#endif
607		538
608	// a "factory" g	539	// a "factory" g
609	rxvt_ptytty *	540	rxvt_ptytty *
610	rxvt_new_ptytty ()	541	rxvt_new_ptytty ()

Diff Legend

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

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC vs. Revision 1.53 by ayin, Sat Jan 21 18:15:26 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC vs.
Revision 1.53 by ayin, Sat Jan 21 18:15:26 2006 UTC