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.25 by root, Sun Jan 1 05:08:41 2006 UTC vs.
Revision 1.41 by root, Tue Jan 17 15:41:33 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/*
… …
74get_pty (int *fd_tty, char **ttydev) 70get_pty (int *fd_tty, char **ttydev)
75{ 71{
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 rxvt_privileges (RESTORE);
82 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 77 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
83 rxvt_privileges (IGNORE);
84 78
85 if (res != -1) 79 if (res != -1)
86 { 80 {
87 *ttydev = strdup (tty_name); 81 *ttydev = strdup (tty_name);
88 return pfd; 82 return pfd;
… …
93 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 87 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
94 if (*ttydev != NULL) 88 if (*ttydev != NULL)
95 return pfd; 89 return pfd;
96#endif 90#endif
97 91
98#ifdef PTYS_ARE_GETPTY
99
100 char *ptydev;
101
102 while ((ptydev = getpty ()) != NULL)
103 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
104 {
105 *ttydev = ptydev;
106 return pfd;
107 }
108#endif
109
110#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 92#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
111# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 93# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
112 94
113 { 95 {
114# ifdef PTYS_ARE_GETPT 96# ifdef PTYS_ARE_GETPT
115 pfd = getpt (); 97 pfd = getpt();
98# else
99# ifdef PTYS_ARE_POSIX
100 pfd = posix_openpt (O_RDWR);
116# else 101# else
117 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 102 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
103# endif
118# endif 104# endif
119 105
120 if (pfd >= 0) 106 if (pfd >= 0)
121 { 107 {
122 if (grantpt (pfd) == 0 /* change slave permissions */ 108 if (grantpt (pfd) == 0 /* change slave permissions */
… …
232/*----------------------------------------------------------------------*/ 218/*----------------------------------------------------------------------*/
233/* 219/*
234 * 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
235 */ 221 */
236static int 222static int
237control_tty (int fd_tty, const char *ttydev) 223control_tty (int fd_tty)
238{ 224{
239#ifndef __QNX__
240 int fd; 225 int fd;
241 226
242 /* ---------------------------------------- */ 227 /* ---------------------------------------- */
243# ifdef HAVE_SETSID
244 setsid (); 228 setsid ();
245# endif
246# if defined(HAVE_SETPGID)
247 setpgid (0, 0);
248# elif defined(HAVE_SETPGRP)
249 setpgrp (0, 0);
250# endif
251 229
252 /* ---------------------------------------- */ 230 /* ---------------------------------------- */
253# ifdef TIOCNOTTY
254 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
255 if (fd >= 0)
256 {
257 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
258 close (fd);
259 }
260# endif
261
262 /* ---------------------------------------- */
263 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
264 if (fd >= 0)
265 close (fd); /* ouch: still have controlling tty */
266
267 /* ---------------------------------------- */
268#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 231# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
269 /* 232 /*
270 * Push STREAMS modules: 233 * Push STREAMS modules:
271 * ptem: pseudo-terminal hardware emulation module. 234 * ptem: pseudo-terminal hardware emulation module.
272 * ldterm: standard terminal line discipline. 235 * ldterm: standard terminal line discipline.
273 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 236 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
281 * documentation is really unclear about whether it is any close () on 244 * documentation is really unclear about whether it is any close () on
282 * 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
283 * 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
284 * through - Geoff Wing 247 * through - Geoff Wing
285 */ 248 */
286# ifdef HAVE_ISASTREAM 249# ifdef HAVE_ISASTREAM
287 if (isastream (fd_tty) == 1) 250 if (isastream (fd_tty) == 1)
288# endif 251# endif
289 { 252 {
290 ioctl (fd_tty, I_PUSH, "ptem"); 253 ioctl (fd_tty, I_PUSH, "ptem");
291 ioctl (fd_tty, I_PUSH, "ldterm"); 254 ioctl (fd_tty, I_PUSH, "ldterm");
292 ioctl (fd_tty, I_PUSH, "ttcompat"); 255 ioctl (fd_tty, I_PUSH, "ttcompat");
293 } 256 }
294#endif 257# endif
295 /* ---------------------------------------- */ 258 /* ---------------------------------------- */
296# if defined(TIOCSCTTY)
297 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 259 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
298# elif defined(TIOCSETCTTY)
299 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
300# else
301 fd = open (ttydev, O_RDWR);
302 if (fd >= 0)
303 close (fd);
304# endif
305 /* ---------------------------------------- */ 260 /* ---------------------------------------- */
306 fd = open ("/dev/tty", O_WRONLY); 261 fd = open ("/dev/tty", O_WRONLY);
307 if (fd < 0) 262 if (fd < 0)
308 return -1; /* fatal */ 263 return -1; /* fatal */
309 close (fd); 264 close (fd);
310 /* ---------------------------------------- */ 265 /* ---------------------------------------- */
311#endif /* ! __QNX__ */
312 266
313 return 0; 267 return 0;
314} 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/////////////////////////////////////////////////////////////////////////////
315 314
316#ifndef NO_SETOWNER_TTYDEV 315#ifndef NO_SETOWNER_TTYDEV
317static struct ttyconf { 316static struct ttyconf {
318 gid_t gid; 317 gid_t gid;
319 mode_t mode; 318 mode_t mode;
… …
335 gid = getgid (); 334 gid = getgid ();
336 } 335 }
337 } 336 }
338} ttyconf; 337} ttyconf;
339 338
339/////////////////////////////////////////////////////////////////////////////
340
340void 341void
341rxvt_ptytty::privileges (rxvt_privaction action) 342rxvt_ptytty_unix::privileges (rxvt_privaction action)
342{ 343{
343 if (pty < 0) 344 if (!name || !*name)
344 return; 345 return;
345 346
346 rxvt_privileges (RESTORE);
347
348 if (action == SAVE) 347 if (action == SAVE)
349 { 348 {
350 //next_tty_action = RESTORE;
351# ifndef RESET_TTY_TO_COMMON_DEFAULTS 349# ifndef RESET_TTY_TO_COMMON_DEFAULTS
352 /* 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 */
353 if (lstat (name, &savestat) < 0) /* you lose out */ 351 if (lstat (name, &savestat) < 0) /* you lose out */
354 ;//next_tty_action = IGNORE; 352 ;
355 else 353 else
356# endif 354# endif
357 { 355 {
356 saved = true;
358 chown (name, getuid (), ttyconf.gid); /* fail silently */ 357 chown (name, getuid (), ttyconf.gid); /* fail silently */
359 chmod (name, ttyconf.mode); 358 chmod (name, ttyconf.mode);
360# ifdef HAVE_REVOKE 359# ifdef HAVE_REVOKE
361 revoke (name); 360 revoke (name);
362# endif 361# endif
363 } 362 }
364 } 363 }
365 else 364 else
366 { /* action == RESTORE */ 365 { /* action == RESTORE */
367 //next_tty_action = IGNORE;
368# ifndef RESET_TTY_TO_COMMON_DEFAULTS 366# ifndef RESET_TTY_TO_COMMON_DEFAULTS
367 if (saved)
368 {
369 chmod (name, savestat.st_mode); 369 chmod (name, savestat.st_mode);
370 chown (name, savestat.st_uid, savestat.st_gid); 370 chown (name, savestat.st_uid, savestat.st_gid);
371 }
371# else 372# else
372 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));
373 chown (name, 0, 0); 374 chown (name, 0, 0);
374# endif 375# endif
375 376
376 } 377 }
377
378 rxvt_privileges (IGNORE);
379} 378}
380#endif 379#endif
381 380
382rxvt_ptytty::rxvt_ptytty () 381rxvt_ptytty_unix::rxvt_ptytty_unix ()
383{ 382{
384 pty = tty = -1; 383 pty = tty = -1;
385 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
386} 391}
387 392
388rxvt_ptytty::~rxvt_ptytty () 393rxvt_ptytty_unix::~rxvt_ptytty_unix ()
389{ 394{
395 logout ();
390 put (); 396 put ();
391} 397}
392 398
393void 399void
394
395rxvt_ptytty::close_tty ()
396{
397 if (tty >= 0) close (tty);
398 tty = -1;
399}
400
401void
402rxvt_ptytty::put () 400rxvt_ptytty_unix::put ()
403{ 401{
404#ifndef NO_SETOWNER_TTYDEV 402#ifndef NO_SETOWNER_TTYDEV
405 if (tty >= 0)
406 privileges (RESTORE); 403 privileges (RESTORE);
407#endif 404#endif
408 405
409 if (pty >= 0) close (pty); 406 if (pty >= 0) close (pty);
410 close_tty (); 407 close_tty ();
411 free (name); 408 free (name);
… …
413 pty = tty = -1; 410 pty = tty = -1;
414 name = 0; 411 name = 0;
415} 412}
416 413
417bool 414bool
418rxvt_ptytty::make_controlling_tty ()
419{
420 return control_tty (tty, name) >= 0;
421}
422
423bool
424rxvt_ptytty::get () 415rxvt_ptytty_unix::get ()
425{ 416{
426 /* get master (pty) */ 417 /* get master (pty) */
427 if ((pty = get_pty (&tty, &name)) < 0) 418 if ((pty = get_pty (&tty, &name)) < 0)
428 return false; 419 return false;
429 420
… …
444 } 435 }
445 436
446 return true; 437 return true;
447} 438}
448 439
440#if PTYTTY_HELPER
441
442static int sock_fd;
443static int pid;
444
445struct command
446{
447 enum { get, login, destroy } type;
448
449 rxvt_ptytty *id;
450
451 bool login_shell;
452 int cmd_pid;
453 char hostname[512]; // arbitrary, but should be plenty
454};
455
456struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
457{
458 rxvt_ptytty *id;
459
460 ~rxvt_ptytty_proxy ();
461
462 bool get ();
463 void login (int cmd_pid, bool login_shell, const char *hostname);
464};
465
466bool
467rxvt_ptytty_proxy::get ()
468{
469 command cmd;
470
471 cmd.type = command::get;
472
473 write (sock_fd, &cmd, sizeof (cmd));
474
475 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
476 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
477
478 if (!id)
479 return false;
480
481 if ((pty = rxvt_recv_fd (sock_fd)) < 0
482 || (tty = rxvt_recv_fd (sock_fd)) < 0)
483 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
484
485 return true;
486}
487
449void 488void
450rxvt_ptytty::set_utf8_mode (bool on) 489rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
451{ 490{
452#ifdef IUTF8 491 command cmd;
453 if (pty != -1)
454 {
455 struct termios tio;
456 492
457 if (tcgetattr (pty, &tio) != -1) 493 cmd.type = command::login;
494 cmd.id = id;
495 cmd.cmd_pid = cmd_pid;
496 cmd.login_shell = login_shell;
497 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
498
499 write (sock_fd, &cmd, sizeof (cmd));
500}
501
502rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
503{
504 command cmd;
505
506 cmd.type = command::destroy;
507 cmd.id = id;
508
509 write (sock_fd, &cmd, sizeof (cmd));
510}
511
512static
513void serve ()
514{
515 command cmd;
516 vector<rxvt_ptytty *> ptys;
517
518 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
519 {
520 if (cmd.type == command::get)
521 {
522 // -> id ptyfd ttyfd
523 cmd.id = new rxvt_ptytty_unix;
524
525 if (cmd.id->get ())
458 { 526 {
459 tcflag_t new_cflag = tio.c_iflag; 527 write (sock_fd, &cmd.id, sizeof (cmd.id));
528 ptys.push_back (cmd.id);
460 529
461 if (on) 530 rxvt_send_fd (sock_fd, cmd.id->pty);
462 new_cflag |= IUTF8; 531 rxvt_send_fd (sock_fd, cmd.id->tty);
532 }
463 else 533 else
464 new_cflag &= ~IUTF8;
465
466 if (new_cflag != tio.c_iflag)
467 { 534 {
468 tio.c_iflag = new_cflag; 535 delete cmd.id;
469 tcsetattr (pty, TCSANOW, &tio); 536 cmd.id = 0;
537 write (sock_fd, &cmd.id, sizeof (cmd.id));
470 } 538 }
471 } 539 }
540 else if (cmd.type == command::login)
541 {
542 if (find (ptys.begin (), ptys.end (), cmd.id))
543 {
544 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
545 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
546 }
547 }
548 else if (cmd.type == command::destroy)
549 {
550 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
551
552 if (*pty)
553 {
554 ptys.erase (pty);
555 delete *pty;
556 }
557 }
558 else
559 break;
560 }
561
562 // destroy all ptys
563 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
564 delete *i;
565}
566
567void rxvt_ptytty_server ()
568{
569 int sv[2];
570
571 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
572 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
573
574 pid = fork ();
575
576 if (pid < 0)
577 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
578
579 if (pid)
472 } 580 {
581 // client, urxvt
582 sock_fd = sv[0];
583 close (sv[1]);
584 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
585 }
586 else
587 {
588 setgid (getegid ());
589 setuid (geteuid ());
590
591 // server, pty-helper
592 sock_fd = sv[1];
593
594 for (int fd = 0; fd < 1023; fd++)
595 if (fd != sock_fd)
596 close (fd);
597
598 serve ();
599 _exit (EXIT_SUCCESS);
600 }
601}
473#endif 602#endif
603
604// a "factory" *g*
605rxvt_ptytty *
606rxvt_new_ptytty ()
607{
608#if PTYTTY_HELPER
609 if (pid > 0)
610 // use helper process
611 return new rxvt_ptytty_proxy;
612 else
613#endif
614 return new rxvt_ptytty_unix;
474} 615}
475 616
476/*----------------------- end-of-file (C source) -----------------------*/ 617/*----------------------- end-of-file (C source) -----------------------*/
477 618

Diff Legend

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