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

Diff Legend

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