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

Diff Legend

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