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.26 by root, Mon Jan 2 15:10:18 2006 UTC vs.
Revision 1.35 by root, Tue Jan 17 10:19:13 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>
29
30#ifdef HAVE_SYS_TYPES_H 30#ifdef HAVE_SYS_TYPES_H
31# include <sys/types.h> 31# include <sys/types.h>
32#endif 32#endif
33#ifdef HAVE_UNISTD_H 33#ifdef HAVE_UNISTD_H
34# include <unistd.h> 34# include <unistd.h>
35#endif 35#endif
36#if defined(HAVE_STRING_H)
37# include <cstring>
38#endif
39#ifdef HAVE_FCNTL_H 36#ifdef HAVE_FCNTL_H
40# include <fcntl.h> 37# include <fcntl.h>
41#endif 38#endif
42#ifdef HAVE_SYS_IOCTL_H 39#ifdef HAVE_SYS_IOCTL_H
43# include <sys/ioctl.h> 40# include <sys/ioctl.h>
… …
46# include <sys/stropts.h> /* for I_PUSH */ 43# include <sys/stropts.h> /* for I_PUSH */
47#endif 44#endif
48#ifdef HAVE_ISASTREAM 45#ifdef HAVE_ISASTREAM
49# include <stropts.h> 46# include <stropts.h>
50#endif 47#endif
51#ifdef HAVE_PTY_H 48#if defined(HAVE_PTY_H)
52# include <pty.h> 49# include <pty.h>
53#endif 50#elif defined(HAVE_LIBUTIL_H)
54
55// better do this via configure, but....
56#if defined(__FreeBSD__)
57# include <libutil.h> 51# include <libutil.h>
58#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) 52#elif defined(HAVE_UTIL_H)
59# include <util.h> 53# include <util.h>
60#endif 54#endif
61 55
62#include <cstdio> 56#include <cstdio>
63#include <grp.h> 57#include <grp.h>
… …
76 int pfd; 70 int pfd;
77 71
78#ifdef PTYS_ARE_OPENPTY 72#ifdef PTYS_ARE_OPENPTY
79 char tty_name[sizeof "/dev/pts/????\0"]; 73 char tty_name[sizeof "/dev/pts/????\0"];
80 74
75 rxvt_privileges(RESTORE);
81 if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) 76 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
77 rxvt_privileges(IGNORE);
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 char *ptydev;
96
97 while ((ptydev = getpty ()) != NULL)
98 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
99 {
100 *ttydev = ptydev;
101 return pfd;
102 }
103#endif
104
105#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 92#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
106# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 93# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
107 94
108 { 95 {
109# ifdef PTYS_ARE_GETPT 96# ifdef PTYS_ARE_GETPT
110 pfd = getpt (); 97 pfd = getpt();
98# else
99# ifdef PTYS_ARE_POSIX
100 pfd = posix_openpt (O_RDWR);
111# else 101# else
112 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 102 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
103# endif
113# endif 104# endif
114 105
115 if (pfd >= 0) 106 if (pfd >= 0)
116 { 107 {
117 if (grantpt (pfd) == 0 /* change slave permissions */ 108 if (grantpt (pfd) == 0 /* change slave permissions */
… …
381 pty = tty = -1; 372 pty = tty = -1;
382 name = 0; 373 name = 0;
383#ifndef NO_SETOWNER_TTYDEV 374#ifndef NO_SETOWNER_TTYDEV
384 saved = false; 375 saved = false;
385#endif 376#endif
377#if UTMP_SUPPORT
378 cmd_pid = 0;
379#endif
386} 380}
387 381
388rxvt_ptytty::~rxvt_ptytty () 382rxvt_ptytty::~rxvt_ptytty ()
389{ 383{
384 logout ();
390 put (); 385 put ();
391} 386}
392 387
393void 388void
394 389
395rxvt_ptytty::close_tty () 390rxvt_ptytty::close_tty ()
396{ 391{
397 if (tty >= 0) close (tty); 392 if (tty < 0)
393 return;
394
395 close (tty);
398 tty = -1; 396 tty = -1;
399} 397}
400 398
401void 399void
402rxvt_ptytty::put () 400rxvt_ptytty::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);
… …
448 445
449void 446void
450rxvt_ptytty::set_utf8_mode (bool on) 447rxvt_ptytty::set_utf8_mode (bool on)
451{ 448{
452#ifdef IUTF8 449#ifdef IUTF8
453 if (pty != -1) 450 if (pty < 0)
454 { 451 return;
452
455 struct termios tio; 453 struct termios tio;
456 454
457 if (tcgetattr (pty, &tio) != -1) 455 if (tcgetattr (pty, &tio) != -1)
456 {
457 tcflag_t new_cflag = tio.c_iflag;
458
459 if (on)
460 new_cflag |= IUTF8;
461 else
462 new_cflag &= ~IUTF8;
463
464 if (new_cflag != tio.c_iflag)
458 { 465 {
459 tcflag_t new_cflag = tio.c_iflag;
460
461 if (on)
462 new_cflag |= IUTF8;
463 else
464 new_cflag &= ~IUTF8;
465
466 if (new_cflag != tio.c_iflag)
467 {
468 tio.c_iflag = new_cflag; 466 tio.c_iflag = new_cflag;
469 tcsetattr (pty, TCSANOW, &tio); 467 tcsetattr (pty, TCSANOW, &tio);
470 }
471 } 468 }
472 } 469 }
473#endif 470#endif
474} 471}
475 472

Diff Legend

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