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.18 by root, Sun Dec 12 05:54:05 2004 UTC vs.
Revision 1.37 by root, Tue Jan 17 11:02:10 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 48#if defined(HAVE_PTY_H)
52// better do this via configure, but.... 49# include <pty.h>
53#if defined(__FreeBSD__) 50#elif defined(HAVE_LIBUTIL_H)
54# include <libutil.h> 51# include <libutil.h>
55#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) 52#elif defined(HAVE_UTIL_H)
56# include <util.h> 53# include <util.h>
57#endif 54#endif
58 55
59#include <cstdio> 56#include <cstdio>
60#include <grp.h> 57#include <grp.h>
58
59/////////////////////////////////////////////////////////////////////////////
61 60
62/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
63 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
64 * ------------------------------------------------------------------------- */ 63 * ------------------------------------------------------------------------- */
65/* 64/*
… …
73 int pfd; 72 int pfd;
74 73
75#ifdef PTYS_ARE_OPENPTY 74#ifdef PTYS_ARE_OPENPTY
76 char tty_name[sizeof "/dev/pts/????\0"]; 75 char tty_name[sizeof "/dev/pts/????\0"];
77 76
77 rxvt_privileges(RESTORE);
78 if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) 78 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79 rxvt_privileges(IGNORE);
80
81 if (res != -1)
79 { 82 {
80 *ttydev = strdup (tty_name); 83 *ttydev = strdup (tty_name);
81 return pfd; 84 return pfd;
82 } 85 }
83#endif 86#endif
… …
86 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
87 if (*ttydev != NULL) 90 if (*ttydev != NULL)
88 return pfd; 91 return pfd;
89#endif 92#endif
90 93
91#ifdef PTYS_ARE_GETPTY
92
93 char *ptydev;
94
95 while ((ptydev = getpty ()) != NULL)
96 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
97 {
98 *ttydev = ptydev;
99 return pfd;
100 }
101#endif
102
103#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 94#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
104# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 95# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
105 96
106 { 97 {
107# ifdef PTYS_ARE_GETPT 98# ifdef PTYS_ARE_GETPT
108 pfd = getpt (); 99 pfd = getpt();
100# else
101# ifdef PTYS_ARE_POSIX
102 pfd = posix_openpt (O_RDWR);
109# else 103# else
110 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 104 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
105# endif
111# endif 106# endif
112 107
113 if (pfd >= 0) 108 if (pfd >= 0)
114 { 109 {
115 if (grantpt (pfd) == 0 /* change slave permissions */ 110 if (grantpt (pfd) == 0 /* change slave permissions */
… …
225/*----------------------------------------------------------------------*/ 220/*----------------------------------------------------------------------*/
226/* 221/*
227 * Make our tty a controlling tty so that /dev/tty points to us 222 * Make our tty a controlling tty so that /dev/tty points to us
228 */ 223 */
229static int 224static int
230control_tty (int fd_tty, const char *ttydev) 225control_tty (int fd_tty)
231{ 226{
232#ifndef __QNX__
233 int fd; 227 int fd;
234 228
235 /* ---------------------------------------- */ 229 /* ---------------------------------------- */
236# ifdef HAVE_SETSID 230# ifdef HAVE_SETSID
237 setsid (); 231 setsid ();
… …
256 fd = open ("/dev/tty", O_RDWR | O_NOCTTY); 250 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
257 if (fd >= 0) 251 if (fd >= 0)
258 close (fd); /* ouch: still have controlling tty */ 252 close (fd); /* ouch: still have controlling tty */
259 253
260 /* ---------------------------------------- */ 254 /* ---------------------------------------- */
261#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 255# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
262 /* 256 /*
263 * Push STREAMS modules: 257 * Push STREAMS modules:
264 * ptem: pseudo-terminal hardware emulation module. 258 * ptem: pseudo-terminal hardware emulation module.
265 * ldterm: standard terminal line discipline. 259 * ldterm: standard terminal line discipline.
266 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 260 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
274 * documentation is really unclear about whether it is any close () on 268 * documentation is really unclear about whether it is any close () on
275 * the master side or the last close () - i.e. a proper STREAMS dismantling 269 * the master side or the last close () - i.e. a proper STREAMS dismantling
276 * close () - on the master side which causes a hang up to be sent 270 * close () - on the master side which causes a hang up to be sent
277 * through - Geoff Wing 271 * through - Geoff Wing
278 */ 272 */
279# ifdef HAVE_ISASTREAM 273# ifdef HAVE_ISASTREAM
280 if (isastream (fd_tty) == 1) 274 if (isastream (fd_tty) == 1)
281# endif 275# endif
282 { 276 {
283 ioctl (fd_tty, I_PUSH, "ptem"); 277 ioctl (fd_tty, I_PUSH, "ptem");
284 ioctl (fd_tty, I_PUSH, "ldterm"); 278 ioctl (fd_tty, I_PUSH, "ldterm");
285 ioctl (fd_tty, I_PUSH, "ttcompat"); 279 ioctl (fd_tty, I_PUSH, "ttcompat");
286 } 280 }
287#endif 281# endif
288 /* ---------------------------------------- */ 282 /* ---------------------------------------- */
289# if defined(TIOCSCTTY)
290 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 283 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
291# elif defined(TIOCSETCTTY)
292 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
293# else
294 fd = open (ttydev, O_RDWR);
295 if (fd >= 0)
296 close (fd);
297# endif
298 /* ---------------------------------------- */ 284 /* ---------------------------------------- */
299 fd = open ("/dev/tty", O_WRONLY); 285 fd = open ("/dev/tty", O_WRONLY);
300 if (fd < 0) 286 if (fd < 0)
301 return -1; /* fatal */ 287 return -1; /* fatal */
302 close (fd); 288 close (fd);
303 /* ---------------------------------------- */ 289 /* ---------------------------------------- */
304#endif /* ! __QNX__ */
305 290
306 return 0; 291 return 0;
307} 292}
293
294void
295rxvt_ptytty::close_tty ()
296{
297 if (tty < 0)
298 return;
299
300 close (tty);
301 tty = -1;
302}
303
304bool
305rxvt_ptytty::make_controlling_tty ()
306{
307 return control_tty (tty) >= 0;
308}
309
310void
311rxvt_ptytty::set_utf8_mode (bool on)
312{
313#ifdef IUTF8
314 if (pty < 0)
315 return;
316
317 struct termios tio;
318
319 if (tcgetattr (pty, &tio) != -1)
320 {
321 tcflag_t new_cflag = tio.c_iflag;
322
323 if (on)
324 new_cflag |= IUTF8;
325 else
326 new_cflag &= ~IUTF8;
327
328 if (new_cflag != tio.c_iflag)
329 {
330 tio.c_iflag = new_cflag;
331 tcsetattr (pty, TCSANOW, &tio);
332 }
333 }
334#endif
335}
336
337/////////////////////////////////////////////////////////////////////////////
308 338
309#ifndef NO_SETOWNER_TTYDEV 339#ifndef NO_SETOWNER_TTYDEV
310static struct ttyconf { 340static struct ttyconf {
311 gid_t gid; 341 gid_t gid;
312 mode_t mode; 342 mode_t mode;
… …
328 gid = getgid (); 358 gid = getgid ();
329 } 359 }
330 } 360 }
331} ttyconf; 361} ttyconf;
332 362
363/////////////////////////////////////////////////////////////////////////////
364
333void 365void
334rxvt_ptytty::privileges (rxvt_privaction action) 366rxvt_ptytty_unix::privileges (rxvt_privaction action)
335{ 367{
368 if (!name || !*name)
369 return;
370
336 rxvt_privileges (RESTORE); 371 rxvt_privileges (RESTORE);
337 372
338 if (action == SAVE) 373 if (action == SAVE)
339 { 374 {
340 //next_tty_action = RESTORE;
341# ifndef RESET_TTY_TO_COMMON_DEFAULTS 375# ifndef RESET_TTY_TO_COMMON_DEFAULTS
342 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 376 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
343 if (lstat (name, &savestat) < 0) /* you lose out */ 377 if (lstat (name, &savestat) < 0) /* you lose out */
344 ;//next_tty_action = IGNORE; 378 ;
345 else 379 else
346# endif 380# endif
347
348 { 381 {
382 saved = true;
349 chown (name, getuid (), ttyconf.gid); /* fail silently */ 383 chown (name, getuid (), ttyconf.gid); /* fail silently */
350 chmod (name, ttyconf.mode); 384 chmod (name, ttyconf.mode);
351# ifdef HAVE_REVOKE 385# ifdef HAVE_REVOKE
352 revoke (name); 386 revoke (name);
353# endif 387# endif
354
355 } 388 }
356 } 389 }
357 else 390 else
358 { /* action == RESTORE */ 391 { /* action == RESTORE */
359 //next_tty_action = IGNORE;
360# ifndef RESET_TTY_TO_COMMON_DEFAULTS 392# ifndef RESET_TTY_TO_COMMON_DEFAULTS
393 if (saved)
394 {
361 chmod (name, savestat.st_mode); 395 chmod (name, savestat.st_mode);
362 chown (name, savestat.st_uid, savestat.st_gid); 396 chown (name, savestat.st_uid, savestat.st_gid);
397 }
363# else 398# else
364 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 399 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
365 chown (name, 0, 0); 400 chown (name, 0, 0);
366# endif 401# endif
367 402
… …
369 404
370 rxvt_privileges (IGNORE); 405 rxvt_privileges (IGNORE);
371} 406}
372#endif 407#endif
373 408
374rxvt_ptytty::rxvt_ptytty () 409rxvt_ptytty_unix::rxvt_ptytty_unix ()
375{ 410{
376 pty = tty = -1; 411 pty = tty = -1;
377 name = 0; 412 name = 0;
413#ifndef NO_SETOWNER_TTYDEV
414 saved = false;
415#endif
416#if UTMP_SUPPORT
417 cmd_pid = 0;
418#endif
378} 419}
379 420
380rxvt_ptytty::~rxvt_ptytty () 421rxvt_ptytty_unix::~rxvt_ptytty_unix ()
381{ 422{
423 logout ();
382 put (); 424 put ();
383} 425}
384 426
385void 427void
386
387rxvt_ptytty::close_tty ()
388{
389 if (tty >= 0) close (tty);
390 tty = -1;
391}
392
393void
394rxvt_ptytty::put () 428rxvt_ptytty_unix::put ()
395{ 429{
396#ifndef NO_SETOWNER_TTYDEV 430#ifndef NO_SETOWNER_TTYDEV
397 if (tty >= 0)
398 privileges (RESTORE); 431 privileges (RESTORE);
399#endif 432#endif
400 433
401 if (pty >= 0) close (pty); 434 if (pty >= 0) close (pty);
402 close_tty (); 435 close_tty ();
403 free (name); 436 free (name);
… …
405 pty = tty = -1; 438 pty = tty = -1;
406 name = 0; 439 name = 0;
407} 440}
408 441
409bool 442bool
410rxvt_ptytty::make_controlling_tty ()
411{
412 return control_tty (tty, name) >= 0;
413}
414
415bool
416rxvt_ptytty::get () 443rxvt_ptytty_unix::get ()
417{ 444{
418 /* get master (pty) */ 445 /* get master (pty) */
419 if ((pty = get_pty (&tty, &name)) < 0) 446 if ((pty = get_pty (&tty, &name)) < 0)
420 return false; 447 return false;
421 448

Diff Legend

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