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.24 by root, Sat Dec 31 16:06:48 2005 UTC vs.
Revision 1.33 by root, Wed Jan 11 23:08:54 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>
… …
74get_pty (int *fd_tty, char **ttydev) 68get_pty (int *fd_tty, char **ttydev)
75{ 69{
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
81 rxvt_privileges (RESTORE); 75 rxvt_privileges(RESTORE);
82 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 76 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
83 rxvt_privileges (IGNORE); 77 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_POSIX) || defined(PTYS_ARE_PTMX)
112 94
113 { 95 {
114# ifdef PTYS_ARE_GETPT 96# ifdef PTYS_ARE_POSIX
115 pfd = getpt (); 97 pfd = posix_openpt (O_RDWR);
116# else 98# else
117 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 99 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
118# endif 100# endif
119 101
120 if (pfd >= 0) 102 if (pfd >= 0)
… …
338} ttyconf; 320} ttyconf;
339 321
340void 322void
341rxvt_ptytty::privileges (rxvt_privaction action) 323rxvt_ptytty::privileges (rxvt_privaction action)
342{ 324{
343 if (tty < 0) 325 if (!name || !*name)
344 return; 326 return;
345 327
346 rxvt_privileges (RESTORE); 328 rxvt_privileges (RESTORE);
347 329
348 if (action == SAVE) 330 if (action == SAVE)
349 { 331 {
350 //next_tty_action = RESTORE;
351# ifndef RESET_TTY_TO_COMMON_DEFAULTS 332# ifndef RESET_TTY_TO_COMMON_DEFAULTS
352 /* 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 */
353 if (lstat (name, &savestat) < 0) /* you lose out */ 334 if (lstat (name, &savestat) < 0) /* you lose out */
354 ;//next_tty_action = IGNORE; 335 ;
355 else 336 else
356# endif 337# endif
357 { 338 {
339 saved = true;
358 chown (name, getuid (), ttyconf.gid); /* fail silently */ 340 chown (name, getuid (), ttyconf.gid); /* fail silently */
359 chmod (name, ttyconf.mode); 341 chmod (name, ttyconf.mode);
360# ifdef HAVE_REVOKE 342# ifdef HAVE_REVOKE
361 revoke (name); 343 revoke (name);
362# endif 344# endif
363 } 345 }
364 } 346 }
365 else 347 else
366 { /* action == RESTORE */ 348 { /* action == RESTORE */
367 //next_tty_action = IGNORE;
368# ifndef RESET_TTY_TO_COMMON_DEFAULTS 349# ifndef RESET_TTY_TO_COMMON_DEFAULTS
350 if (saved)
351 {
369 chmod (name, savestat.st_mode); 352 chmod (name, savestat.st_mode);
370 chown (name, savestat.st_uid, savestat.st_gid); 353 chown (name, savestat.st_uid, savestat.st_gid);
354 }
371# else 355# else
372 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));
373 chown (name, 0, 0); 357 chown (name, 0, 0);
374# endif 358# endif
375 359
… …
381 365
382rxvt_ptytty::rxvt_ptytty () 366rxvt_ptytty::rxvt_ptytty ()
383{ 367{
384 pty = tty = -1; 368 pty = tty = -1;
385 name = 0; 369 name = 0;
370#ifndef NO_SETOWNER_TTYDEV
371 saved = false;
372#endif
386} 373}
387 374
388rxvt_ptytty::~rxvt_ptytty () 375rxvt_ptytty::~rxvt_ptytty ()
389{ 376{
390 put (); 377 put ();
… …
392 379
393void 380void
394 381
395rxvt_ptytty::close_tty () 382rxvt_ptytty::close_tty ()
396{ 383{
397 if (tty >= 0) close (tty); 384 if (tty < 0)
385 return;
386
387 close (tty);
398 tty = -1; 388 tty = -1;
399} 389}
400 390
401void 391void
402rxvt_ptytty::put () 392rxvt_ptytty::put ()
403{ 393{
404#ifndef NO_SETOWNER_TTYDEV 394#ifndef NO_SETOWNER_TTYDEV
405 if (tty >= 0)
406 privileges (RESTORE); 395 privileges (RESTORE);
407#endif 396#endif
408 397
409 if (pty >= 0) close (pty); 398 if (pty >= 0) close (pty);
410 close_tty (); 399 close_tty ();
411 free (name); 400 free (name);
… …
448 437
449void 438void
450rxvt_ptytty::set_utf8_mode (bool on) 439rxvt_ptytty::set_utf8_mode (bool on)
451{ 440{
452#ifdef IUTF8 441#ifdef IUTF8
453 if (pty != -1) 442 if (pty < 0)
454 { 443 return;
444
455 struct termios tio; 445 struct termios tio;
456 446
457 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)
458 { 457 {
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; 458 tio.c_iflag = new_cflag;
469 tcsetattr (pty, TCSANOW, &tio); 459 tcsetattr (pty, TCSANOW, &tio);
470 }
471 } 460 }
472 } 461 }
473#endif 462#endif
474} 463}
475 464

Diff Legend

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