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.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 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#include "ptytty.h"
60
61/////////////////////////////////////////////////////////////////////////////
59 62
60/* ------------------------------------------------------------------------- * 63/* ------------------------------------------------------------------------- *
61 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 64 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
62 * ------------------------------------------------------------------------- */ 65 * ------------------------------------------------------------------------- */
63/* 66/*
… …
71 int pfd; 74 int pfd;
72 75
73#ifdef PTYS_ARE_OPENPTY 76#ifdef PTYS_ARE_OPENPTY
74 char tty_name[sizeof "/dev/pts/????\0"]; 77 char tty_name[sizeof "/dev/pts/????\0"];
75 78
79 rxvt_privileges(RESTORE);
76 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)
77 { 84 {
78 *ttydev = strdup (tty_name); 85 *ttydev = strdup (tty_name);
79 return pfd; 86 return pfd;
80 } 87 }
81#endif 88#endif
… …
84 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 91 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
85 if (*ttydev != NULL) 92 if (*ttydev != NULL)
86 return pfd; 93 return pfd;
87#endif 94#endif
88 95
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) 96#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
102# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 97# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
103 98
104 { 99 {
105# ifdef PTYS_ARE_GETPT 100# ifdef PTYS_ARE_GETPT
106 pfd = getpt (); 101 pfd = getpt();
102# else
103# ifdef PTYS_ARE_POSIX
104 pfd = posix_openpt (O_RDWR);
107# else 105# else
108 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 106 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
107# endif
109# endif 108# endif
110 109
111 if (pfd >= 0) 110 if (pfd >= 0)
112 { 111 {
113 if (grantpt (pfd) == 0 /* change slave permissions */ 112 if (grantpt (pfd) == 0 /* change slave permissions */
… …
223/*----------------------------------------------------------------------*/ 222/*----------------------------------------------------------------------*/
224/* 223/*
225 * 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
226 */ 225 */
227static int 226static int
228control_tty (int fd_tty, const char *ttydev) 227control_tty (int fd_tty)
229{ 228{
230#ifndef __QNX__
231 int fd; 229 int fd;
232 230
233 /* ---------------------------------------- */ 231 /* ---------------------------------------- */
234# ifdef HAVE_SETSID
235 setsid (); 232 setsid ();
236# endif
237# if defined(HAVE_SETPGID)
238 setpgid (0, 0);
239# elif defined(HAVE_SETPGRP)
240 setpgrp (0, 0);
241# endif
242 233
243 /* ---------------------------------------- */ 234 /* ---------------------------------------- */
244# ifdef TIOCNOTTY
245 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
246 if (fd >= 0)
247 {
248 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
249 close (fd);
250 }
251# endif
252
253 /* ---------------------------------------- */
254 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
255 if (fd >= 0)
256 close (fd); /* ouch: still have controlling tty */
257
258 /* ---------------------------------------- */
259#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 235# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
260 /* 236 /*
261 * Push STREAMS modules: 237 * Push STREAMS modules:
262 * ptem: pseudo-terminal hardware emulation module. 238 * ptem: pseudo-terminal hardware emulation module.
263 * ldterm: standard terminal line discipline. 239 * ldterm: standard terminal line discipline.
264 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 240 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
272 * documentation is really unclear about whether it is any close () on 248 * 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 249 * 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 250 * close () - on the master side which causes a hang up to be sent
275 * through - Geoff Wing 251 * through - Geoff Wing
276 */ 252 */
277# ifdef HAVE_ISASTREAM 253# ifdef HAVE_ISASTREAM
278 if (isastream (fd_tty) == 1) 254 if (isastream (fd_tty) == 1)
279# endif 255# endif
280 { 256 {
281 ioctl (fd_tty, I_PUSH, "ptem"); 257 ioctl (fd_tty, I_PUSH, "ptem");
282 ioctl (fd_tty, I_PUSH, "ldterm"); 258 ioctl (fd_tty, I_PUSH, "ldterm");
283 ioctl (fd_tty, I_PUSH, "ttcompat"); 259 ioctl (fd_tty, I_PUSH, "ttcompat");
284 } 260 }
285#endif 261# endif
286 /* ---------------------------------------- */ 262 /* ---------------------------------------- */
287# if defined(TIOCSCTTY)
288 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 263 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 /* ---------------------------------------- */ 264 /* ---------------------------------------- */
297 fd = open ("/dev/tty", O_WRONLY); 265 fd = open ("/dev/tty", O_WRONLY);
298 if (fd < 0) 266 if (fd < 0)
299 return -1; /* fatal */ 267 return -1; /* fatal */
300 close (fd); 268 close (fd);
301 /* ---------------------------------------- */ 269 /* ---------------------------------------- */
302#endif /* ! __QNX__ */
303 270
304 return 0; 271 return 0;
305} 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/////////////////////////////////////////////////////////////////////////////
306 318
307#ifndef NO_SETOWNER_TTYDEV 319#ifndef NO_SETOWNER_TTYDEV
308static struct ttyconf { 320static struct ttyconf {
309 gid_t gid; 321 gid_t gid;
310 mode_t mode; 322 mode_t mode;
… …
326 gid = getgid (); 338 gid = getgid ();
327 } 339 }
328 } 340 }
329} ttyconf; 341} ttyconf;
330 342
343/////////////////////////////////////////////////////////////////////////////
344
331void 345void
332rxvt_ptytty::privileges (rxvt_privaction action) 346rxvt_ptytty_unix::privileges (rxvt_privaction action)
333{ 347{
348 if (!name || !*name)
349 return;
350
334 rxvt_privileges (RESTORE); 351 rxvt_privileges (RESTORE);
335 352
336 if (action == SAVE) 353 if (action == SAVE)
337 { 354 {
338 //next_tty_action = RESTORE;
339# ifndef RESET_TTY_TO_COMMON_DEFAULTS 355# ifndef RESET_TTY_TO_COMMON_DEFAULTS
340 /* 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 */
341 if (lstat (name, &savestat) < 0) /* you lose out */ 357 if (lstat (name, &savestat) < 0) /* you lose out */
342 ;//next_tty_action = IGNORE; 358 ;
343 else 359 else
344# endif 360# endif
345
346 { 361 {
362 saved = true;
347 chown (name, getuid (), ttyconf.gid); /* fail silently */ 363 chown (name, getuid (), ttyconf.gid); /* fail silently */
348 chmod (name, ttyconf.mode); 364 chmod (name, ttyconf.mode);
349# ifdef HAVE_REVOKE 365# ifdef HAVE_REVOKE
350 revoke (name); 366 revoke (name);
351# endif 367# endif
352
353 } 368 }
354 } 369 }
355 else 370 else
356 { /* action == RESTORE */ 371 { /* action == RESTORE */
357 //next_tty_action = IGNORE;
358# ifndef RESET_TTY_TO_COMMON_DEFAULTS 372# ifndef RESET_TTY_TO_COMMON_DEFAULTS
373 if (saved)
374 {
359 chmod (name, savestat.st_mode); 375 chmod (name, savestat.st_mode);
360 chown (name, savestat.st_uid, savestat.st_gid); 376 chown (name, savestat.st_uid, savestat.st_gid);
377 }
361# else 378# else
362 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));
363 chown (name, 0, 0); 380 chown (name, 0, 0);
364# endif 381# endif
365 382
… …
367 384
368 rxvt_privileges (IGNORE); 385 rxvt_privileges (IGNORE);
369} 386}
370#endif 387#endif
371 388
372rxvt_ptytty::rxvt_ptytty () 389rxvt_ptytty_unix::rxvt_ptytty_unix ()
373{ 390{
374 pty = tty = -1; 391 pty = tty = -1;
375 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
376} 399}
377 400
378rxvt_ptytty::~rxvt_ptytty () 401rxvt_ptytty_unix::~rxvt_ptytty_unix ()
379{ 402{
403 logout ();
380 put (); 404 put ();
381} 405}
382 406
383void 407void
384
385rxvt_ptytty::close_tty ()
386{
387 if (tty >= 0) close (tty);
388 tty = -1;
389}
390
391void
392rxvt_ptytty::put () 408rxvt_ptytty_unix::put ()
393{ 409{
394#ifndef NO_SETOWNER_TTYDEV 410#ifndef NO_SETOWNER_TTYDEV
395 if (tty >= 0)
396 privileges (RESTORE); 411 privileges (RESTORE);
397#endif 412#endif
398 413
399 if (pty >= 0) close (pty); 414 if (pty >= 0) close (pty);
400 close_tty (); 415 close_tty ();
401 free (name); 416 free (name);
… …
403 pty = tty = -1; 418 pty = tty = -1;
404 name = 0; 419 name = 0;
405} 420}
406 421
407bool 422bool
408rxvt_ptytty::make_controlling_tty ()
409{
410 return control_tty (tty, name) >= 0;
411}
412
413bool
414rxvt_ptytty::get () 423rxvt_ptytty_unix::get ()
415{ 424{
416 /* get master (pty) */ 425 /* get master (pty) */
417 if ((pty = get_pty (&tty, &name)) < 0) 426 if ((pty = get_pty (&tty, &name)) < 0)
418 return false; 427 return false;
419 428
… …
434 } 443 }
435 444
436 return true; 445 return true;
437} 446}
438 447
448// a "factory" *g*
449rxvt_ptytty *rxvt_new_ptytty ()
450{
451 return new rxvt_ptytty_unix;
452}
453
439/*----------------------- end-of-file (C source) -----------------------*/ 454/*----------------------- end-of-file (C source) -----------------------*/
440 455

Diff Legend

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