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.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#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__
236 int fd; 227 int fd;
237 228
238 /* ---------------------------------------- */ 229 /* ---------------------------------------- */
239# ifdef HAVE_SETSID 230# ifdef HAVE_SETSID
240 setsid (); 231 setsid ();
… …
259 fd = open ("/dev/tty", O_RDWR | O_NOCTTY); 250 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
260 if (fd >= 0) 251 if (fd >= 0)
261 close (fd); /* ouch: still have controlling tty */ 252 close (fd); /* ouch: still have controlling tty */
262 253
263 /* ---------------------------------------- */ 254 /* ---------------------------------------- */
264#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 255# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
265 /* 256 /*
266 * Push STREAMS modules: 257 * Push STREAMS modules:
267 * ptem: pseudo-terminal hardware emulation module. 258 * ptem: pseudo-terminal hardware emulation module.
268 * ldterm: standard terminal line discipline. 259 * ldterm: standard terminal line discipline.
269 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 260 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
277 * documentation is really unclear about whether it is any close () on 268 * 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 269 * 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 270 * close () - on the master side which causes a hang up to be sent
280 * through - Geoff Wing 271 * through - Geoff Wing
281 */ 272 */
282# ifdef HAVE_ISASTREAM 273# ifdef HAVE_ISASTREAM
283 if (isastream (fd_tty) == 1) 274 if (isastream (fd_tty) == 1)
284# endif 275# endif
285 { 276 {
286 ioctl (fd_tty, I_PUSH, "ptem"); 277 ioctl (fd_tty, I_PUSH, "ptem");
287 ioctl (fd_tty, I_PUSH, "ldterm"); 278 ioctl (fd_tty, I_PUSH, "ldterm");
288 ioctl (fd_tty, I_PUSH, "ttcompat"); 279 ioctl (fd_tty, I_PUSH, "ttcompat");
289 } 280 }
290#endif 281# endif
291 /* ---------------------------------------- */ 282 /* ---------------------------------------- */
292# if defined(TIOCSCTTY)
293 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 283 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 /* ---------------------------------------- */ 284 /* ---------------------------------------- */
302 fd = open ("/dev/tty", O_WRONLY); 285 fd = open ("/dev/tty", O_WRONLY);
303 if (fd < 0) 286 if (fd < 0)
304 return -1; /* fatal */ 287 return -1; /* fatal */
305 close (fd); 288 close (fd);
306 /* ---------------------------------------- */ 289 /* ---------------------------------------- */
307#endif /* ! __QNX__ */
308 290
309 return 0; 291 return 0;
310} 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/////////////////////////////////////////////////////////////////////////////
311 338
312#ifndef NO_SETOWNER_TTYDEV 339#ifndef NO_SETOWNER_TTYDEV
313static struct ttyconf { 340static struct ttyconf {
314 gid_t gid; 341 gid_t gid;
315 mode_t mode; 342 mode_t mode;
… …
331 gid = getgid (); 358 gid = getgid ();
332 } 359 }
333 } 360 }
334} ttyconf; 361} ttyconf;
335 362
363/////////////////////////////////////////////////////////////////////////////
364
336void 365void
337rxvt_ptytty::privileges (rxvt_privaction action) 366rxvt_ptytty_unix::privileges (rxvt_privaction action)
338{ 367{
368 if (!name || !*name)
369 return;
370
339 rxvt_privileges (RESTORE); 371 rxvt_privileges (RESTORE);
340 372
341 if (action == SAVE) 373 if (action == SAVE)
342 { 374 {
343 //next_tty_action = RESTORE;
344# ifndef RESET_TTY_TO_COMMON_DEFAULTS 375# ifndef RESET_TTY_TO_COMMON_DEFAULTS
345 /* 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 */
346 if (lstat (name, &savestat) < 0) /* you lose out */ 377 if (lstat (name, &savestat) < 0) /* you lose out */
347 ;//next_tty_action = IGNORE; 378 ;
348 else 379 else
349# endif 380# endif
350
351 { 381 {
382 saved = true;
352 chown (name, getuid (), ttyconf.gid); /* fail silently */ 383 chown (name, getuid (), ttyconf.gid); /* fail silently */
353 chmod (name, ttyconf.mode); 384 chmod (name, ttyconf.mode);
354# ifdef HAVE_REVOKE 385# ifdef HAVE_REVOKE
355 revoke (name); 386 revoke (name);
356# endif 387# endif
357
358 } 388 }
359 } 389 }
360 else 390 else
361 { /* action == RESTORE */ 391 { /* action == RESTORE */
362 //next_tty_action = IGNORE;
363# ifndef RESET_TTY_TO_COMMON_DEFAULTS 392# ifndef RESET_TTY_TO_COMMON_DEFAULTS
393 if (saved)
394 {
364 chmod (name, savestat.st_mode); 395 chmod (name, savestat.st_mode);
365 chown (name, savestat.st_uid, savestat.st_gid); 396 chown (name, savestat.st_uid, savestat.st_gid);
397 }
366# else 398# else
367 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));
368 chown (name, 0, 0); 400 chown (name, 0, 0);
369# endif 401# endif
370 402
… …
372 404
373 rxvt_privileges (IGNORE); 405 rxvt_privileges (IGNORE);
374} 406}
375#endif 407#endif
376 408
377rxvt_ptytty::rxvt_ptytty () 409rxvt_ptytty_unix::rxvt_ptytty_unix ()
378{ 410{
379 pty = tty = -1; 411 pty = tty = -1;
380 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
381} 419}
382 420
383rxvt_ptytty::~rxvt_ptytty () 421rxvt_ptytty_unix::~rxvt_ptytty_unix ()
384{ 422{
423 logout ();
385 put (); 424 put ();
386} 425}
387 426
388void 427void
389
390rxvt_ptytty::close_tty ()
391{
392 if (tty >= 0) close (tty);
393 tty = -1;
394}
395
396void
397rxvt_ptytty::put () 428rxvt_ptytty_unix::put ()
398{ 429{
399#ifndef NO_SETOWNER_TTYDEV 430#ifndef NO_SETOWNER_TTYDEV
400 if (tty >= 0)
401 privileges (RESTORE); 431 privileges (RESTORE);
402#endif 432#endif
403 433
404 if (pty >= 0) close (pty); 434 if (pty >= 0) close (pty);
405 close_tty (); 435 close_tty ();
406 free (name); 436 free (name);
… …
408 pty = tty = -1; 438 pty = tty = -1;
409 name = 0; 439 name = 0;
410} 440}
411 441
412bool 442bool
413rxvt_ptytty::make_controlling_tty ()
414{
415 return control_tty (tty, name) >= 0;
416}
417
418bool
419rxvt_ptytty::get () 443rxvt_ptytty_unix::get ()
420{ 444{
421 /* get master (pty) */ 445 /* get master (pty) */
422 if ((pty = get_pty (&tty, &name)) < 0) 446 if ((pty = get_pty (&tty, &name)) < 0)
423 return false; 447 return false;
424 448
… …
439 } 463 }
440 464
441 return true; 465 return true;
442} 466}
443 467
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) -----------------------*/ 468/*----------------------- end-of-file (C source) -----------------------*/
472 469

Diff Legend

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