ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/ptytty.C
(Generate patch)

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.22 by root, Tue Jan 11 04:44:57 2005 UTC vs.
Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC

… …
2 * File: ptytty.C 2 * File: ptytty.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
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#ifdef HAVE_STDLIB_H
28# include <cstdlib> 27#include <cstdlib>
29#endif 28#include <cstring>
30#ifdef HAVE_SYS_TYPES_H 29
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#if defined(HAVE_STRING_H)
37# include <cstring>
38#endif
39#ifdef HAVE_FCNTL_H
40# include <fcntl.h> 33#include <fcntl.h>
41#endif 34
42#ifdef HAVE_SYS_IOCTL_H 35#ifdef HAVE_SYS_IOCTL_H
43# include <sys/ioctl.h> 36# include <sys/ioctl.h>
44#endif 37#endif
45#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
46# include <sys/stropts.h> /* for I_PUSH */ 39# include <sys/stropts.h> /* for I_PUSH */
47#endif 40#endif
48#ifdef HAVE_ISASTREAM 41#ifdef HAVE_ISASTREAM
49# include <stropts.h> 42# include <stropts.h>
50#endif 43#endif
51#ifdef HAVE_PTY_H 44#if defined(HAVE_PTY_H)
52# include <pty.h> 45# include <pty.h>
53#endif 46#elif defined(HAVE_LIBUTIL_H)
54
55// better do this via configure, but....
56#if defined(__FreeBSD__)
57# include <libutil.h> 47# include <libutil.h>
58#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) 48#elif defined(HAVE_UTIL_H)
59# include <util.h> 49# include <util.h>
60#endif 50#endif
61 51
62#include <cstdio> 52#include <cstdio>
63#include <grp.h> 53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58
59/////////////////////////////////////////////////////////////////////////////
64 60
65/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
66 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
67 * ------------------------------------------------------------------------- */ 63 * ------------------------------------------------------------------------- */
68/* 64/*
… …
76 int pfd; 72 int pfd;
77 73
78#ifdef PTYS_ARE_OPENPTY 74#ifdef PTYS_ARE_OPENPTY
79 char tty_name[sizeof "/dev/pts/????\0"]; 75 char tty_name[sizeof "/dev/pts/????\0"];
80 76
81 if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) 77 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
78
79 if (res != -1)
82 { 80 {
83 *ttydev = strdup (tty_name); 81 *ttydev = strdup (tty_name);
84 return pfd; 82 return pfd;
85 } 83 }
86#endif 84#endif
… …
89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 87 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
90 if (*ttydev != NULL) 88 if (*ttydev != NULL)
91 return pfd; 89 return pfd;
92#endif 90#endif
93 91
94#ifdef PTYS_ARE_GETPTY
95
96 char *ptydev;
97
98 while ((ptydev = getpty ()) != NULL)
99 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
100 {
101 *ttydev = ptydev;
102 return pfd;
103 }
104#endif
105
106#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 92#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
107# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 93# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
108 94
109 { 95 {
110# ifdef PTYS_ARE_GETPT 96# ifdef PTYS_ARE_GETPT
111 pfd = getpt (); 97 pfd = getpt();
98# else
99# ifdef PTYS_ARE_POSIX
100 pfd = posix_openpt (O_RDWR);
112# else 101# else
113 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 102 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
103# endif
114# endif 104# endif
115 105
116 if (pfd >= 0) 106 if (pfd >= 0)
117 { 107 {
118 if (grantpt (pfd) == 0 /* change slave permissions */ 108 if (grantpt (pfd) == 0 /* change slave permissions */
… …
228/*----------------------------------------------------------------------*/ 218/*----------------------------------------------------------------------*/
229/* 219/*
230 * Make our tty a controlling tty so that /dev/tty points to us 220 * Make our tty a controlling tty so that /dev/tty points to us
231 */ 221 */
232static int 222static int
233control_tty (int fd_tty, const char *ttydev) 223control_tty (int fd_tty)
234{ 224{
235#ifndef __QNX__
236 int fd; 225 int fd;
237 226
238 /* ---------------------------------------- */ 227 /* ---------------------------------------- */
239# ifdef HAVE_SETSID
240 setsid (); 228 setsid ();
241# endif
242# if defined(HAVE_SETPGID)
243 setpgid (0, 0);
244# elif defined(HAVE_SETPGRP)
245 setpgrp (0, 0);
246# endif
247 229
248 /* ---------------------------------------- */ 230 /* ---------------------------------------- */
249# ifdef TIOCNOTTY
250 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
251 if (fd >= 0)
252 {
253 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
254 close (fd);
255 }
256# endif
257
258 /* ---------------------------------------- */
259 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
260 if (fd >= 0)
261 close (fd); /* ouch: still have controlling tty */
262
263 /* ---------------------------------------- */
264#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 231# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
265 /* 232 /*
266 * Push STREAMS modules: 233 * Push STREAMS modules:
267 * ptem: pseudo-terminal hardware emulation module. 234 * ptem: pseudo-terminal hardware emulation module.
268 * ldterm: standard terminal line discipline. 235 * ldterm: standard terminal line discipline.
269 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 236 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
277 * documentation is really unclear about whether it is any close () on 244 * documentation is really unclear about whether it is any close () on
278 * the master side or the last close () - i.e. a proper STREAMS dismantling 245 * the master side or the last close () - i.e. a proper STREAMS dismantling
279 * close () - on the master side which causes a hang up to be sent 246 * close () - on the master side which causes a hang up to be sent
280 * through - Geoff Wing 247 * through - Geoff Wing
281 */ 248 */
282# ifdef HAVE_ISASTREAM 249# ifdef HAVE_ISASTREAM
283 if (isastream (fd_tty) == 1) 250 if (isastream (fd_tty) == 1)
284# endif 251# endif
285 { 252 {
286 ioctl (fd_tty, I_PUSH, "ptem"); 253 ioctl (fd_tty, I_PUSH, "ptem");
287 ioctl (fd_tty, I_PUSH, "ldterm"); 254 ioctl (fd_tty, I_PUSH, "ldterm");
288 ioctl (fd_tty, I_PUSH, "ttcompat"); 255 ioctl (fd_tty, I_PUSH, "ttcompat");
289 } 256 }
290#endif 257# endif
291 /* ---------------------------------------- */ 258 /* ---------------------------------------- */
292# if defined(TIOCSCTTY)
293 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 259 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
294# elif defined(TIOCSETCTTY)
295 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
296# else
297 fd = open (ttydev, O_RDWR);
298 if (fd >= 0)
299 close (fd);
300# endif
301 /* ---------------------------------------- */ 260 /* ---------------------------------------- */
302 fd = open ("/dev/tty", O_WRONLY); 261 fd = open ("/dev/tty", O_WRONLY);
303 if (fd < 0) 262 if (fd < 0)
304 return -1; /* fatal */ 263 return -1; /* fatal */
305 close (fd); 264 close (fd);
306 /* ---------------------------------------- */ 265 /* ---------------------------------------- */
307#endif /* ! __QNX__ */
308 266
309 return 0; 267 return 0;
310} 268}
269
270void
271rxvt_ptytty::close_tty ()
272{
273 if (tty < 0)
274 return;
275
276 close (tty);
277 tty = -1;
278}
279
280bool
281rxvt_ptytty::make_controlling_tty ()
282{
283 return control_tty (tty) >= 0;
284}
285
286void
287rxvt_ptytty::set_utf8_mode (bool on)
288{
289#ifdef IUTF8
290 if (pty < 0)
291 return;
292
293 struct termios tio;
294
295 if (tcgetattr (pty, &tio) != -1)
296 {
297 tcflag_t new_cflag = tio.c_iflag;
298
299 if (on)
300 new_cflag |= IUTF8;
301 else
302 new_cflag &= ~IUTF8;
303
304 if (new_cflag != tio.c_iflag)
305 {
306 tio.c_iflag = new_cflag;
307 tcsetattr (pty, TCSANOW, &tio);
308 }
309 }
310#endif
311}
312
313/////////////////////////////////////////////////////////////////////////////
311 314
312#ifndef NO_SETOWNER_TTYDEV 315#ifndef NO_SETOWNER_TTYDEV
313static struct ttyconf { 316static struct ttyconf {
314 gid_t gid; 317 gid_t gid;
315 mode_t mode; 318 mode_t mode;
… …
331 gid = getgid (); 334 gid = getgid ();
332 } 335 }
333 } 336 }
334} ttyconf; 337} ttyconf;
335 338
339/////////////////////////////////////////////////////////////////////////////
340
336void 341void
337rxvt_ptytty::privileges (rxvt_privaction action) 342rxvt_ptytty_unix::privileges (rxvt_privaction action)
338{ 343{
339 rxvt_privileges (RESTORE); 344 if (!name || !*name)
345 return;
340 346
341 if (action == SAVE) 347 if (action == SAVE)
342 { 348 {
343 //next_tty_action = RESTORE;
344# ifndef RESET_TTY_TO_COMMON_DEFAULTS 349# ifndef RESET_TTY_TO_COMMON_DEFAULTS
345 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 350 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
346 if (lstat (name, &savestat) < 0) /* you lose out */ 351 if (lstat (name, &savestat) < 0) /* you lose out */
347 ;//next_tty_action = IGNORE; 352 ;
348 else 353 else
349# endif 354# endif
350
351 { 355 {
356 saved = true;
352 chown (name, getuid (), ttyconf.gid); /* fail silently */ 357 chown (name, getuid (), ttyconf.gid); /* fail silently */
353 chmod (name, ttyconf.mode); 358 chmod (name, ttyconf.mode);
354# ifdef HAVE_REVOKE 359# ifdef HAVE_REVOKE
355 revoke (name); 360 revoke (name);
356# endif 361# endif
357
358 } 362 }
359 } 363 }
360 else 364 else
361 { /* action == RESTORE */ 365 { /* action == RESTORE */
362 //next_tty_action = IGNORE;
363# ifndef RESET_TTY_TO_COMMON_DEFAULTS 366# ifndef RESET_TTY_TO_COMMON_DEFAULTS
367 if (saved)
368 {
364 chmod (name, savestat.st_mode); 369 chmod (name, savestat.st_mode);
365 chown (name, savestat.st_uid, savestat.st_gid); 370 chown (name, savestat.st_uid, savestat.st_gid);
371 }
366# else 372# else
367 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 373 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
368 chown (name, 0, 0); 374 chown (name, 0, 0);
369# endif 375# endif
370 376
371 } 377 }
372
373 rxvt_privileges (IGNORE);
374} 378}
375#endif 379#endif
376 380
377rxvt_ptytty::rxvt_ptytty () 381rxvt_ptytty_unix::rxvt_ptytty_unix ()
378{ 382{
379 pty = tty = -1; 383 pty = tty = -1;
380 name = 0; 384 name = 0;
385#ifndef NO_SETOWNER_TTYDEV
386 saved = false;
387#endif
388#if UTMP_SUPPORT
389 cmd_pid = 0;
390#endif
381} 391}
382 392
383rxvt_ptytty::~rxvt_ptytty () 393rxvt_ptytty_unix::~rxvt_ptytty_unix ()
384{ 394{
395#if UTMP_SUPPORT
396 logout ();
397#endif
385 put (); 398 put ();
386} 399}
387 400
388void 401void
389
390rxvt_ptytty::close_tty ()
391{
392 if (tty >= 0) close (tty);
393 tty = -1;
394}
395
396void
397rxvt_ptytty::put () 402rxvt_ptytty_unix::put ()
398{ 403{
399#ifndef NO_SETOWNER_TTYDEV 404#ifndef NO_SETOWNER_TTYDEV
400 if (tty >= 0)
401 privileges (RESTORE); 405 privileges (RESTORE);
402#endif 406#endif
403 407
404 if (pty >= 0) close (pty); 408 if (pty >= 0) close (pty);
405 close_tty (); 409 close_tty ();
406 free (name); 410 free (name);
… …
408 pty = tty = -1; 412 pty = tty = -1;
409 name = 0; 413 name = 0;
410} 414}
411 415
412bool 416bool
413rxvt_ptytty::make_controlling_tty ()
414{
415 return control_tty (tty, name) >= 0;
416}
417
418bool
419rxvt_ptytty::get () 417rxvt_ptytty_unix::get ()
420{ 418{
421 /* get master (pty) */ 419 /* get master (pty) */
422 if ((pty = get_pty (&tty, &name)) < 0) 420 if ((pty = get_pty (&tty, &name)) < 0)
423 return false; 421 return false;
424 422
… …
439 } 437 }
440 438
441 return true; 439 return true;
442} 440}
443 441
442#if PTYTTY_HELPER
443
444static int sock_fd;
445static int pid;
446
447struct command
448{
449 enum { get, login, destroy } type;
450
451 rxvt_ptytty *id;
452
453 bool login_shell;
454 int cmd_pid;
455 char hostname[512]; // arbitrary, but should be plenty
456};
457
458struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
459{
460 rxvt_ptytty *id;
461
462 ~rxvt_ptytty_proxy ();
463
464 bool get ();
465 void login (int cmd_pid, bool login_shell, const char *hostname);
466};
467
468bool
469rxvt_ptytty_proxy::get ()
470{
471 command cmd;
472
473 cmd.type = command::get;
474
475 write (sock_fd, &cmd, sizeof (cmd));
476
477 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
478 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
479
480 if (!id)
481 return false;
482
483 if ((pty = rxvt_recv_fd (sock_fd)) < 0
484 || (tty = rxvt_recv_fd (sock_fd)) < 0)
485 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
486
487 return true;
488}
489
444void 490void
445rxvt_ptytty::set_utf8_mode (bool on) 491rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
446{ 492{
447#ifdef IUTF8 493 command cmd;
448 if (pty != -1)
449 {
450 struct termios tio;
451 494
452 if (tcgetattr (pty, &tio) != -1) 495 cmd.type = command::login;
496 cmd.id = id;
497 cmd.cmd_pid = cmd_pid;
498 cmd.login_shell = login_shell;
499 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
500
501 write (sock_fd, &cmd, sizeof (cmd));
502}
503
504rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
505{
506 command cmd;
507
508 cmd.type = command::destroy;
509 cmd.id = id;
510
511 write (sock_fd, &cmd, sizeof (cmd));
512}
513
514static
515void serve ()
516{
517 command cmd;
518 vector<rxvt_ptytty *> ptys;
519
520 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
521 {
522 if (cmd.type == command::get)
523 {
524 // -> id ptyfd ttyfd
525 cmd.id = new rxvt_ptytty_unix;
526
527 if (cmd.id->get ())
453 { 528 {
454 tcflag_t new_cflag = tio.c_iflag; 529 write (sock_fd, &cmd.id, sizeof (cmd.id));
530 ptys.push_back (cmd.id);
455 531
456 if (on) 532 rxvt_send_fd (sock_fd, cmd.id->pty);
457 new_cflag |= IUTF8; 533 rxvt_send_fd (sock_fd, cmd.id->tty);
534 }
458 else 535 else
459 new_cflag &= ~IUTF8;
460
461 if (new_cflag != tio.c_iflag)
462 { 536 {
463 tio.c_iflag = new_cflag; 537 delete cmd.id;
464 tcsetattr (pty, TCSANOW, &tio); 538 cmd.id = 0;
539 write (sock_fd, &cmd.id, sizeof (cmd.id));
465 } 540 }
466 } 541 }
542 else if (cmd.type == command::login)
543 {
544#if UTMP_SUPPORT
545 if (find (ptys.begin (), ptys.end (), cmd.id))
546 {
547 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
548 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
549 }
550#endif
551 }
552 else if (cmd.type == command::destroy)
553 {
554 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
555
556 if (pty)
557 {
558 delete *pty;
559 ptys.erase (pty);
560 }
561 }
562 else
563 break;
564 }
565
566 // destroy all ptys
567 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
568 delete *i;
569}
570
571void rxvt_ptytty_server ()
572{
573 int sv[2];
574
575 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
576 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
577
578 pid = fork ();
579
580 if (pid < 0)
581 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
582
583 if (pid)
467 } 584 {
585 // client, urxvt
586 sock_fd = sv[0];
587 close (sv[1]);
588 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
589 }
590 else
591 {
592 setgid (getegid ());
593 setuid (geteuid ());
594
595 // server, pty-helper
596 sock_fd = sv[1];
597
598 for (int fd = 0; fd < 1023; fd++)
599 if (fd != sock_fd && fd != 1)
600 close (fd);
601
602 serve ();
603 _exit (EXIT_SUCCESS);
604 }
605}
468#endif 606#endif
607
608// a "factory" *g*
609rxvt_ptytty *
610rxvt_new_ptytty ()
611{
612#if PTYTTY_HELPER
613 if (pid > 0)
614 // use helper process
615 return new rxvt_ptytty_proxy;
616 else
617#endif
618 return new rxvt_ptytty_unix;
469} 619}
470 620
471/*----------------------- end-of-file (C source) -----------------------*/ 621/*----------------------- end-of-file (C source) -----------------------*/
472 622

Diff Legend

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