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.32 by root, Wed Jan 11 20:46:46 2006 UTC vs.
Revision 1.36 by root, Tue Jan 17 10:59:32 2006 UTC

… …
54#endif 54#endif
55 55
56#include <cstdio> 56#include <cstdio>
57#include <grp.h> 57#include <grp.h>
58 58
59/////////////////////////////////////////////////////////////////////////////
60
59/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
60 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
61 * ------------------------------------------------------------------------- */ 63 * ------------------------------------------------------------------------- */
62/* 64/*
63 * Returns pty file descriptor, or -1 on failure 65 * Returns pty file descriptor, or -1 on failure
… …
88 if (*ttydev != NULL) 90 if (*ttydev != NULL)
89 return pfd; 91 return pfd;
90#endif 92#endif
91 93
92#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 94#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
93# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 95# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
94 96
95 { 97 {
96# ifdef PTYS_ARE_GETPT 98# ifdef PTYS_ARE_GETPT
97 pfd = getpt (); 99 pfd = getpt();
100# else
101# ifdef PTYS_ARE_POSIX
102 pfd = posix_openpt (O_RDWR);
98# else 103# else
99 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 104 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
105# endif
100# endif 106# endif
101 107
102 if (pfd >= 0) 108 if (pfd >= 0)
103 { 109 {
104 if (grantpt (pfd) == 0 /* change slave permissions */ 110 if (grantpt (pfd) == 0 /* change slave permissions */
… …
214/*----------------------------------------------------------------------*/ 220/*----------------------------------------------------------------------*/
215/* 221/*
216 * 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
217 */ 223 */
218static int 224static int
219control_tty (int fd_tty, const char *ttydev) 225control_tty (int fd_tty)
220{ 226{
221#ifndef __QNX__ 227#ifndef __QNX__
222 int fd; 228 int fd;
223 229
224 /* ---------------------------------------- */ 230 /* ---------------------------------------- */
… …
245 fd = open ("/dev/tty", O_RDWR | O_NOCTTY); 251 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
246 if (fd >= 0) 252 if (fd >= 0)
247 close (fd); /* ouch: still have controlling tty */ 253 close (fd); /* ouch: still have controlling tty */
248 254
249 /* ---------------------------------------- */ 255 /* ---------------------------------------- */
250#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 256# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
251 /* 257 /*
252 * Push STREAMS modules: 258 * Push STREAMS modules:
253 * ptem: pseudo-terminal hardware emulation module. 259 * ptem: pseudo-terminal hardware emulation module.
254 * ldterm: standard terminal line discipline. 260 * ldterm: standard terminal line discipline.
255 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 261 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
263 * documentation is really unclear about whether it is any close () on 269 * documentation is really unclear about whether it is any close () on
264 * 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
265 * 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
266 * through - Geoff Wing 272 * through - Geoff Wing
267 */ 273 */
268# ifdef HAVE_ISASTREAM 274# ifdef HAVE_ISASTREAM
269 if (isastream (fd_tty) == 1) 275 if (isastream (fd_tty) == 1)
270# endif 276# endif
271 { 277 {
272 ioctl (fd_tty, I_PUSH, "ptem"); 278 ioctl (fd_tty, I_PUSH, "ptem");
273 ioctl (fd_tty, I_PUSH, "ldterm"); 279 ioctl (fd_tty, I_PUSH, "ldterm");
274 ioctl (fd_tty, I_PUSH, "ttcompat"); 280 ioctl (fd_tty, I_PUSH, "ttcompat");
275 } 281 }
276#endif 282# endif
277 /* ---------------------------------------- */ 283 /* ---------------------------------------- */
278# if defined(TIOCSCTTY)
279 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 284 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
280# elif defined(TIOCSETCTTY)
281 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
282# else
283 fd = open (ttydev, O_RDWR);
284 if (fd >= 0)
285 close (fd);
286# endif
287 /* ---------------------------------------- */ 285 /* ---------------------------------------- */
288 fd = open ("/dev/tty", O_WRONLY); 286 fd = open ("/dev/tty", O_WRONLY);
289 if (fd < 0) 287 if (fd < 0)
290 return -1; /* fatal */ 288 return -1; /* fatal */
291 close (fd); 289 close (fd);
292 /* ---------------------------------------- */ 290 /* ---------------------------------------- */
293#endif /* ! __QNX__ */ 291#endif /* ! __QNX__ */
294 292
295 return 0; 293 return 0;
296} 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/////////////////////////////////////////////////////////////////////////////
297 340
298#ifndef NO_SETOWNER_TTYDEV 341#ifndef NO_SETOWNER_TTYDEV
299static struct ttyconf { 342static struct ttyconf {
300 gid_t gid; 343 gid_t gid;
301 mode_t mode; 344 mode_t mode;
… …
317 gid = getgid (); 360 gid = getgid ();
318 } 361 }
319 } 362 }
320} ttyconf; 363} ttyconf;
321 364
365/////////////////////////////////////////////////////////////////////////////
366
322void 367void
323rxvt_ptytty::privileges (rxvt_privaction action) 368rxvt_ptytty_unix::privileges (rxvt_privaction action)
324{ 369{
325 if (!name || !*name) 370 if (!name || !*name)
326 return; 371 return;
327 372
328 rxvt_privileges (RESTORE); 373 rxvt_privileges (RESTORE);
… …
361 406
362 rxvt_privileges (IGNORE); 407 rxvt_privileges (IGNORE);
363} 408}
364#endif 409#endif
365 410
366rxvt_ptytty::rxvt_ptytty () 411rxvt_ptytty_unix::rxvt_ptytty_unix ()
367{ 412{
368 pty = tty = -1; 413 pty = tty = -1;
369 name = 0; 414 name = 0;
370#ifndef NO_SETOWNER_TTYDEV 415#ifndef NO_SETOWNER_TTYDEV
371 saved = false; 416 saved = false;
372#endif 417#endif
418#if UTMP_SUPPORT
419 cmd_pid = 0;
420#endif
373} 421}
374 422
375rxvt_ptytty::~rxvt_ptytty () 423rxvt_ptytty_unix::~rxvt_ptytty_unix ()
376{ 424{
425 logout ();
377 put (); 426 put ();
378} 427}
379 428
380void 429void
381
382rxvt_ptytty::close_tty ()
383{
384 if (tty < 0)
385 return;
386
387 close (tty);
388 tty = -1;
389}
390
391void
392rxvt_ptytty::put () 430rxvt_ptytty_unix::put ()
393{ 431{
394#ifndef NO_SETOWNER_TTYDEV 432#ifndef NO_SETOWNER_TTYDEV
395 privileges (RESTORE); 433 privileges (RESTORE);
396#endif 434#endif
397 435
… …
402 pty = tty = -1; 440 pty = tty = -1;
403 name = 0; 441 name = 0;
404} 442}
405 443
406bool 444bool
407rxvt_ptytty::make_controlling_tty ()
408{
409 return control_tty (tty, name) >= 0;
410}
411
412bool
413rxvt_ptytty::get () 445rxvt_ptytty_unix::get ()
414{ 446{
415 /* get master (pty) */ 447 /* get master (pty) */
416 if ((pty = get_pty (&tty, &name)) < 0) 448 if ((pty = get_pty (&tty, &name)) < 0)
417 return false; 449 return false;
418 450
… …
433 } 465 }
434 466
435 return true; 467 return true;
436} 468}
437 469
438void
439rxvt_ptytty::set_utf8_mode (bool on)
440{
441#ifdef IUTF8
442 if (pty < 0)
443 return;
444
445 struct termios tio;
446
447 if (tcgetattr (pty, &tio) != -1)
448 {
449 tcflag_t new_cflag = tio.c_iflag;
450
451 if (on)
452 new_cflag |= IUTF8;
453 else
454 new_cflag &= ~IUTF8;
455
456 if (new_cflag != tio.c_iflag)
457 {
458 tio.c_iflag = new_cflag;
459 tcsetattr (pty, TCSANOW, &tio);
460 }
461 }
462#endif
463}
464
465/*----------------------- end-of-file (C source) -----------------------*/ 470/*----------------------- end-of-file (C source) -----------------------*/
466 471

Diff Legend

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