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.31 by root, Tue Jan 10 18:09:22 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
… …
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 92#ifdef PTYS_ARE_GETPTY
95
96 char *ptydev; 93 char *ptydev;
97 94
98 while ((ptydev = getpty ()) != NULL) 95 while ((ptydev = getpty ()) != NULL)
99 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) 96 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
100 { 97 {
… …
334} ttyconf; 331} ttyconf;
335 332
336void 333void
337rxvt_ptytty::privileges (rxvt_privaction action) 334rxvt_ptytty::privileges (rxvt_privaction action)
338{ 335{
339 if (tty < 0) 336 if (!name || !*name)
340 return; 337 return;
341 338
342 rxvt_privileges (RESTORE); 339 rxvt_privileges (RESTORE);
343 340
344 if (action == SAVE) 341 if (action == SAVE)
345 { 342 {
346 //next_tty_action = RESTORE;
347# ifndef RESET_TTY_TO_COMMON_DEFAULTS 343# ifndef RESET_TTY_TO_COMMON_DEFAULTS
348 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 344 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
349 if (lstat (name, &savestat) < 0) /* you lose out */ 345 if (lstat (name, &savestat) < 0) /* you lose out */
350 ;//next_tty_action = IGNORE; 346 ;
351 else 347 else
352# endif 348# endif
353 { 349 {
350 saved = true;
354 chown (name, getuid (), ttyconf.gid); /* fail silently */ 351 chown (name, getuid (), ttyconf.gid); /* fail silently */
355 chmod (name, ttyconf.mode); 352 chmod (name, ttyconf.mode);
356# ifdef HAVE_REVOKE 353# ifdef HAVE_REVOKE
357 revoke (name); 354 revoke (name);
358# endif 355# endif
359 } 356 }
360 } 357 }
361 else 358 else
362 { /* action == RESTORE */ 359 { /* action == RESTORE */
363 //next_tty_action = IGNORE;
364# ifndef RESET_TTY_TO_COMMON_DEFAULTS 360# ifndef RESET_TTY_TO_COMMON_DEFAULTS
361 if (saved)
362 {
365 chmod (name, savestat.st_mode); 363 chmod (name, savestat.st_mode);
366 chown (name, savestat.st_uid, savestat.st_gid); 364 chown (name, savestat.st_uid, savestat.st_gid);
365 }
367# else 366# else
368 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 367 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
369 chown (name, 0, 0); 368 chown (name, 0, 0);
370# endif 369# endif
371 370
… …
377 376
378rxvt_ptytty::rxvt_ptytty () 377rxvt_ptytty::rxvt_ptytty ()
379{ 378{
380 pty = tty = -1; 379 pty = tty = -1;
381 name = 0; 380 name = 0;
381#ifndef NO_SETOWNER_TTYDEV
382 saved = false;
383#endif
382} 384}
383 385
384rxvt_ptytty::~rxvt_ptytty () 386rxvt_ptytty::~rxvt_ptytty ()
385{ 387{
386 put (); 388 put ();
… …
388 390
389void 391void
390 392
391rxvt_ptytty::close_tty () 393rxvt_ptytty::close_tty ()
392{ 394{
393 if (tty >= 0) close (tty); 395 if (tty < 0)
396 return;
397
398 close (tty);
394 tty = -1; 399 tty = -1;
395} 400}
396 401
397void 402void
398rxvt_ptytty::put () 403rxvt_ptytty::put ()
399{ 404{
400#ifndef NO_SETOWNER_TTYDEV 405#ifndef NO_SETOWNER_TTYDEV
401 if (tty >= 0)
402 privileges (RESTORE); 406 privileges (RESTORE);
403#endif 407#endif
404 408
405 if (pty >= 0) close (pty); 409 if (pty >= 0) close (pty);
406 close_tty (); 410 close_tty ();
407 free (name); 411 free (name);
… …
444 448
445void 449void
446rxvt_ptytty::set_utf8_mode (bool on) 450rxvt_ptytty::set_utf8_mode (bool on)
447{ 451{
448#ifdef IUTF8 452#ifdef IUTF8
449 if (pty != -1) 453 if (pty < 0)
450 { 454 return;
455
451 struct termios tio; 456 struct termios tio;
452 457
453 if (tcgetattr (pty, &tio) != -1) 458 if (tcgetattr (pty, &tio) != -1)
459 {
460 tcflag_t new_cflag = tio.c_iflag;
461
462 if (on)
463 new_cflag |= IUTF8;
464 else
465 new_cflag &= ~IUTF8;
466
467 if (new_cflag != tio.c_iflag)
454 { 468 {
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; 469 tio.c_iflag = new_cflag;
465 tcsetattr (pty, TCSANOW, &tio); 470 tcsetattr (pty, TCSANOW, &tio);
466 }
467 } 471 }
468 } 472 }
469#endif 473#endif
470} 474}
471 475

Diff Legend

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