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.23 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.34 by ayin, Tue Jan 17 08:54: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>
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
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 */
… …
334} ttyconf; 324} ttyconf;
335 325
336void 326void
337rxvt_ptytty::privileges (rxvt_privaction action) 327rxvt_ptytty::privileges (rxvt_privaction action)
338{ 328{
339 if (tty < 0) 329 if (!name || !*name)
340 return; 330 return;
341 331
342 rxvt_privileges (RESTORE); 332 rxvt_privileges (RESTORE);
343 333
344 if (action == SAVE) 334 if (action == SAVE)
345 { 335 {
346 //next_tty_action = RESTORE;
347# ifndef RESET_TTY_TO_COMMON_DEFAULTS 336# ifndef RESET_TTY_TO_COMMON_DEFAULTS
348 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 337 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
349 if (lstat (name, &savestat) < 0) /* you lose out */ 338 if (lstat (name, &savestat) < 0) /* you lose out */
350 ;//next_tty_action = IGNORE; 339 ;
351 else 340 else
352# endif 341# endif
353 { 342 {
343 saved = true;
354 chown (name, getuid (), ttyconf.gid); /* fail silently */ 344 chown (name, getuid (), ttyconf.gid); /* fail silently */
355 chmod (name, ttyconf.mode); 345 chmod (name, ttyconf.mode);
356# ifdef HAVE_REVOKE 346# ifdef HAVE_REVOKE
357 revoke (name); 347 revoke (name);
358# endif 348# endif
359 } 349 }
360 } 350 }
361 else 351 else
362 { /* action == RESTORE */ 352 { /* action == RESTORE */
363 //next_tty_action = IGNORE;
364# ifndef RESET_TTY_TO_COMMON_DEFAULTS 353# ifndef RESET_TTY_TO_COMMON_DEFAULTS
354 if (saved)
355 {
365 chmod (name, savestat.st_mode); 356 chmod (name, savestat.st_mode);
366 chown (name, savestat.st_uid, savestat.st_gid); 357 chown (name, savestat.st_uid, savestat.st_gid);
358 }
367# else 359# else
368 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 360 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
369 chown (name, 0, 0); 361 chown (name, 0, 0);
370# endif 362# endif
371 363
… …
377 369
378rxvt_ptytty::rxvt_ptytty () 370rxvt_ptytty::rxvt_ptytty ()
379{ 371{
380 pty = tty = -1; 372 pty = tty = -1;
381 name = 0; 373 name = 0;
374#ifndef NO_SETOWNER_TTYDEV
375 saved = false;
376#endif
382} 377}
383 378
384rxvt_ptytty::~rxvt_ptytty () 379rxvt_ptytty::~rxvt_ptytty ()
385{ 380{
386 put (); 381 put ();
… …
388 383
389void 384void
390 385
391rxvt_ptytty::close_tty () 386rxvt_ptytty::close_tty ()
392{ 387{
393 if (tty >= 0) close (tty); 388 if (tty < 0)
389 return;
390
391 close (tty);
394 tty = -1; 392 tty = -1;
395} 393}
396 394
397void 395void
398rxvt_ptytty::put () 396rxvt_ptytty::put ()
399{ 397{
400#ifndef NO_SETOWNER_TTYDEV 398#ifndef NO_SETOWNER_TTYDEV
401 if (tty >= 0)
402 privileges (RESTORE); 399 privileges (RESTORE);
403#endif 400#endif
404 401
405 if (pty >= 0) close (pty); 402 if (pty >= 0) close (pty);
406 close_tty (); 403 close_tty ();
407 free (name); 404 free (name);
… …
444 441
445void 442void
446rxvt_ptytty::set_utf8_mode (bool on) 443rxvt_ptytty::set_utf8_mode (bool on)
447{ 444{
448#ifdef IUTF8 445#ifdef IUTF8
449 if (pty != -1) 446 if (pty < 0)
450 { 447 return;
448
451 struct termios tio; 449 struct termios tio;
452 450
453 if (tcgetattr (pty, &tio) != -1) 451 if (tcgetattr (pty, &tio) != -1)
452 {
453 tcflag_t new_cflag = tio.c_iflag;
454
455 if (on)
456 new_cflag |= IUTF8;
457 else
458 new_cflag &= ~IUTF8;
459
460 if (new_cflag != tio.c_iflag)
454 { 461 {
455 tcflag_t new_cflag = tio.c_iflag;
456
457 if (on)
458 new_cflag |= IUTF8;
459 else
460 new_cflag &= ~IUTF8;
461
462 if (new_cflag != tio.c_iflag)
463 {
464 tio.c_iflag = new_cflag; 462 tio.c_iflag = new_cflag;
465 tcsetattr (pty, TCSANOW, &tio); 463 tcsetattr (pty, TCSANOW, &tio);
466 }
467 } 464 }
468 } 465 }
469#endif 466#endif
470} 467}
471 468

Diff Legend

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