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.22 by root, Tue Jan 11 04:44:57 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/*
… …
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
77 rxvt_privileges(RESTORE);
81 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)
82 { 82 {
83 *ttydev = strdup (tty_name); 83 *ttydev = strdup (tty_name);
84 return pfd; 84 return pfd;
85 } 85 }
86#endif 86#endif
… …
89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
90 if (*ttydev != NULL) 90 if (*ttydev != NULL)
91 return pfd; 91 return pfd;
92#endif 92#endif
93 93
94#ifdef PTYS_ARE_GETPTY
95
96 char *ptydev;
97
98 while ((ptydev = getpty ()) != NULL)
99 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
100 {
101 *ttydev = ptydev;
102 return pfd;
103 }
104#endif
105
106#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 94#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
107# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 95# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
108 96
109 { 97 {
110# ifdef PTYS_ARE_GETPT 98# ifdef PTYS_ARE_GETPT
111 pfd = getpt (); 99 pfd = getpt();
100# else
101# ifdef PTYS_ARE_POSIX
102 pfd = posix_openpt (O_RDWR);
112# else 103# else
113 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 104 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
105# endif
114# endif 106# endif
115 107
116 if (pfd >= 0) 108 if (pfd >= 0)
117 { 109 {
118 if (grantpt (pfd) == 0 /* change slave permissions */ 110 if (grantpt (pfd) == 0 /* change slave permissions */
… …
228/*----------------------------------------------------------------------*/ 220/*----------------------------------------------------------------------*/
229/* 221/*
230 * 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
231 */ 223 */
232static int 224static int
233control_tty (int fd_tty, const char *ttydev) 225control_tty (int fd_tty)
234{ 226{
235#ifndef __QNX__ 227#ifndef __QNX__
236 int fd; 228 int fd;
237 229
238 /* ---------------------------------------- */ 230 /* ---------------------------------------- */
… …
259 fd = open ("/dev/tty", O_RDWR | O_NOCTTY); 251 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
260 if (fd >= 0) 252 if (fd >= 0)
261 close (fd); /* ouch: still have controlling tty */ 253 close (fd); /* ouch: still have controlling tty */
262 254
263 /* ---------------------------------------- */ 255 /* ---------------------------------------- */
264#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 256# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
265 /* 257 /*
266 * Push STREAMS modules: 258 * Push STREAMS modules:
267 * ptem: pseudo-terminal hardware emulation module. 259 * ptem: pseudo-terminal hardware emulation module.
268 * ldterm: standard terminal line discipline. 260 * ldterm: standard terminal line discipline.
269 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 261 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
277 * documentation is really unclear about whether it is any close () on 269 * documentation is really unclear about whether it is any close () on
278 * 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
279 * 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
280 * through - Geoff Wing 272 * through - Geoff Wing
281 */ 273 */
282# ifdef HAVE_ISASTREAM 274# ifdef HAVE_ISASTREAM
283 if (isastream (fd_tty) == 1) 275 if (isastream (fd_tty) == 1)
284# endif 276# endif
285 { 277 {
286 ioctl (fd_tty, I_PUSH, "ptem"); 278 ioctl (fd_tty, I_PUSH, "ptem");
287 ioctl (fd_tty, I_PUSH, "ldterm"); 279 ioctl (fd_tty, I_PUSH, "ldterm");
288 ioctl (fd_tty, I_PUSH, "ttcompat"); 280 ioctl (fd_tty, I_PUSH, "ttcompat");
289 } 281 }
290#endif 282# endif
291 /* ---------------------------------------- */ 283 /* ---------------------------------------- */
292# if defined(TIOCSCTTY)
293 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 284 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
294# elif defined(TIOCSETCTTY)
295 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
296# else
297 fd = open (ttydev, O_RDWR);
298 if (fd >= 0)
299 close (fd);
300# endif
301 /* ---------------------------------------- */ 285 /* ---------------------------------------- */
302 fd = open ("/dev/tty", O_WRONLY); 286 fd = open ("/dev/tty", O_WRONLY);
303 if (fd < 0) 287 if (fd < 0)
304 return -1; /* fatal */ 288 return -1; /* fatal */
305 close (fd); 289 close (fd);
306 /* ---------------------------------------- */ 290 /* ---------------------------------------- */
307#endif /* ! __QNX__ */ 291#endif /* ! __QNX__ */
308 292
309 return 0; 293 return 0;
310} 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/////////////////////////////////////////////////////////////////////////////
311 340
312#ifndef NO_SETOWNER_TTYDEV 341#ifndef NO_SETOWNER_TTYDEV
313static struct ttyconf { 342static struct ttyconf {
314 gid_t gid; 343 gid_t gid;
315 mode_t mode; 344 mode_t mode;
… …
331 gid = getgid (); 360 gid = getgid ();
332 } 361 }
333 } 362 }
334} ttyconf; 363} ttyconf;
335 364
365/////////////////////////////////////////////////////////////////////////////
366
336void 367void
337rxvt_ptytty::privileges (rxvt_privaction action) 368rxvt_ptytty_unix::privileges (rxvt_privaction action)
338{ 369{
370 if (!name || !*name)
371 return;
372
339 rxvt_privileges (RESTORE); 373 rxvt_privileges (RESTORE);
340 374
341 if (action == SAVE) 375 if (action == SAVE)
342 { 376 {
343 //next_tty_action = RESTORE;
344# ifndef RESET_TTY_TO_COMMON_DEFAULTS 377# ifndef RESET_TTY_TO_COMMON_DEFAULTS
345 /* 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 */
346 if (lstat (name, &savestat) < 0) /* you lose out */ 379 if (lstat (name, &savestat) < 0) /* you lose out */
347 ;//next_tty_action = IGNORE; 380 ;
348 else 381 else
349# endif 382# endif
350
351 { 383 {
384 saved = true;
352 chown (name, getuid (), ttyconf.gid); /* fail silently */ 385 chown (name, getuid (), ttyconf.gid); /* fail silently */
353 chmod (name, ttyconf.mode); 386 chmod (name, ttyconf.mode);
354# ifdef HAVE_REVOKE 387# ifdef HAVE_REVOKE
355 revoke (name); 388 revoke (name);
356# endif 389# endif
357
358 } 390 }
359 } 391 }
360 else 392 else
361 { /* action == RESTORE */ 393 { /* action == RESTORE */
362 //next_tty_action = IGNORE;
363# ifndef RESET_TTY_TO_COMMON_DEFAULTS 394# ifndef RESET_TTY_TO_COMMON_DEFAULTS
395 if (saved)
396 {
364 chmod (name, savestat.st_mode); 397 chmod (name, savestat.st_mode);
365 chown (name, savestat.st_uid, savestat.st_gid); 398 chown (name, savestat.st_uid, savestat.st_gid);
399 }
366# else 400# else
367 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));
368 chown (name, 0, 0); 402 chown (name, 0, 0);
369# endif 403# endif
370 404
… …
372 406
373 rxvt_privileges (IGNORE); 407 rxvt_privileges (IGNORE);
374} 408}
375#endif 409#endif
376 410
377rxvt_ptytty::rxvt_ptytty () 411rxvt_ptytty_unix::rxvt_ptytty_unix ()
378{ 412{
379 pty = tty = -1; 413 pty = tty = -1;
380 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
381} 421}
382 422
383rxvt_ptytty::~rxvt_ptytty () 423rxvt_ptytty_unix::~rxvt_ptytty_unix ()
384{ 424{
425 logout ();
385 put (); 426 put ();
386} 427}
387 428
388void 429void
389
390rxvt_ptytty::close_tty ()
391{
392 if (tty >= 0) close (tty);
393 tty = -1;
394}
395
396void
397rxvt_ptytty::put () 430rxvt_ptytty_unix::put ()
398{ 431{
399#ifndef NO_SETOWNER_TTYDEV 432#ifndef NO_SETOWNER_TTYDEV
400 if (tty >= 0)
401 privileges (RESTORE); 433 privileges (RESTORE);
402#endif 434#endif
403 435
404 if (pty >= 0) close (pty); 436 if (pty >= 0) close (pty);
405 close_tty (); 437 close_tty ();
406 free (name); 438 free (name);
… …
408 pty = tty = -1; 440 pty = tty = -1;
409 name = 0; 441 name = 0;
410} 442}
411 443
412bool 444bool
413rxvt_ptytty::make_controlling_tty ()
414{
415 return control_tty (tty, name) >= 0;
416}
417
418bool
419rxvt_ptytty::get () 445rxvt_ptytty_unix::get ()
420{ 446{
421 /* get master (pty) */ 447 /* get master (pty) */
422 if ((pty = get_pty (&tty, &name)) < 0) 448 if ((pty = get_pty (&tty, &name)) < 0)
423 return false; 449 return false;
424 450
… …
439 } 465 }
440 466
441 return true; 467 return true;
442} 468}
443 469
444void
445rxvt_ptytty::set_utf8_mode (bool on)
446{
447#ifdef IUTF8
448 if (pty != -1)
449 {
450 struct termios tio;
451
452 if (tcgetattr (pty, &tio) != -1)
453 {
454 tcflag_t new_cflag = tio.c_iflag;
455
456 if (on)
457 new_cflag |= IUTF8;
458 else
459 new_cflag &= ~IUTF8;
460
461 if (new_cflag != tio.c_iflag)
462 {
463 tio.c_iflag = new_cflag;
464 tcsetattr (pty, TCSANOW, &tio);
465 }
466 }
467 }
468#endif
469}
470
471/*----------------------- end-of-file (C source) -----------------------*/ 470/*----------------------- end-of-file (C source) -----------------------*/
472 471

Diff Legend

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