… | |
… | |
76 | int pfd; |
76 | int pfd; |
77 | |
77 | |
78 | #ifdef PTYS_ARE_OPENPTY |
78 | #ifdef PTYS_ARE_OPENPTY |
79 | char tty_name[sizeof "/dev/pts/????\0"]; |
79 | char tty_name[sizeof "/dev/pts/????\0"]; |
80 | |
80 | |
|
|
81 | rxvt_privileges(RESTORE); |
81 | if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) |
82 | int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); |
|
|
83 | rxvt_privileges(IGNORE); |
|
|
84 | |
|
|
85 | if (res != -1) |
82 | { |
86 | { |
83 | *ttydev = strdup (tty_name); |
87 | *ttydev = strdup (tty_name); |
84 | return pfd; |
88 | return pfd; |
85 | } |
89 | } |
86 | #endif |
90 | #endif |
… | |
… | |
392 | |
396 | |
393 | void |
397 | void |
394 | |
398 | |
395 | rxvt_ptytty::close_tty () |
399 | rxvt_ptytty::close_tty () |
396 | { |
400 | { |
397 | if (tty >= 0) close (tty); |
401 | if (tty < 0) |
|
|
402 | return; |
|
|
403 | |
|
|
404 | close (tty); |
398 | tty = -1; |
405 | tty = -1; |
399 | } |
406 | } |
400 | |
407 | |
401 | void |
408 | void |
402 | rxvt_ptytty::put () |
409 | rxvt_ptytty::put () |
403 | { |
410 | { |
404 | #ifndef NO_SETOWNER_TTYDEV |
411 | #ifndef NO_SETOWNER_TTYDEV |
405 | if (tty >= 0) |
|
|
406 | privileges (RESTORE); |
412 | privileges (RESTORE); |
407 | #endif |
413 | #endif |
408 | |
414 | |
409 | if (pty >= 0) close (pty); |
415 | if (pty >= 0) close (pty); |
410 | close_tty (); |
416 | close_tty (); |
411 | free (name); |
417 | free (name); |
… | |
… | |
448 | |
454 | |
449 | void |
455 | void |
450 | rxvt_ptytty::set_utf8_mode (bool on) |
456 | rxvt_ptytty::set_utf8_mode (bool on) |
451 | { |
457 | { |
452 | #ifdef IUTF8 |
458 | #ifdef IUTF8 |
453 | if (pty != -1) |
459 | if (pty < 0) |
454 | { |
460 | return; |
|
|
461 | |
455 | struct termios tio; |
462 | struct termios tio; |
456 | |
463 | |
457 | if (tcgetattr (pty, &tio) != -1) |
464 | if (tcgetattr (pty, &tio) != -1) |
|
|
465 | { |
|
|
466 | tcflag_t new_cflag = tio.c_iflag; |
|
|
467 | |
|
|
468 | if (on) |
|
|
469 | new_cflag |= IUTF8; |
|
|
470 | else |
|
|
471 | new_cflag &= ~IUTF8; |
|
|
472 | |
|
|
473 | if (new_cflag != tio.c_iflag) |
458 | { |
474 | { |
459 | tcflag_t new_cflag = tio.c_iflag; |
|
|
460 | |
|
|
461 | if (on) |
|
|
462 | new_cflag |= IUTF8; |
|
|
463 | else |
|
|
464 | new_cflag &= ~IUTF8; |
|
|
465 | |
|
|
466 | if (new_cflag != tio.c_iflag) |
|
|
467 | { |
|
|
468 | tio.c_iflag = new_cflag; |
475 | tio.c_iflag = new_cflag; |
469 | tcsetattr (pty, TCSANOW, &tio); |
476 | tcsetattr (pty, TCSANOW, &tio); |
470 | } |
|
|
471 | } |
477 | } |
472 | } |
478 | } |
473 | #endif |
479 | #endif |
474 | } |
480 | } |
475 | |
481 | |