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

Diff Legend

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