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

Diff Legend

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