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.18 by root, Sun Dec 12 05:54:05 2004 UTC vs.
Revision 1.25 by root, Sun Jan 1 05:08:41 2006 UTC

46# include <sys/stropts.h> /* for I_PUSH */ 46# include <sys/stropts.h> /* for I_PUSH */
47#endif 47#endif
48#ifdef HAVE_ISASTREAM 48#ifdef HAVE_ISASTREAM
49# include <stropts.h> 49# include <stropts.h>
50#endif 50#endif
51#ifdef HAVE_PTY_H
52# include <pty.h>
53#endif
51 54
52// better do this via configure, but.... 55// better do this via configure, but....
53#if defined(__FreeBSD__) 56#if defined(__FreeBSD__)
54# include <libutil.h> 57# include <libutil.h>
55#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__)) 58#elif defined(__DARWIN__) || (defined (__MACH__) && defined (__APPLE__))
71get_pty (int *fd_tty, char **ttydev) 74get_pty (int *fd_tty, char **ttydev)
72{ 75{
73 int pfd; 76 int pfd;
74 77
75#ifdef PTYS_ARE_OPENPTY 78#ifdef PTYS_ARE_OPENPTY
76 char tty_name[sizeof "/dev/pts/????\0"]; 79 char tty_name[sizeof "/dev/pts/?????\0"];
77 80
81 rxvt_privileges (RESTORE);
78 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)
79 { 86 {
80 *ttydev = strdup (tty_name); 87 *ttydev = strdup (tty_name);
81 return pfd; 88 return pfd;
82 } 89 }
83#endif 90#endif
331} ttyconf; 338} ttyconf;
332 339
333void 340void
334rxvt_ptytty::privileges (rxvt_privaction action) 341rxvt_ptytty::privileges (rxvt_privaction action)
335{ 342{
343 if (pty < 0)
344 return;
345
336 rxvt_privileges (RESTORE); 346 rxvt_privileges (RESTORE);
337 347
338 if (action == SAVE) 348 if (action == SAVE)
339 { 349 {
340 //next_tty_action = RESTORE; 350 //next_tty_action = RESTORE;
342 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 352 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
343 if (lstat (name, &savestat) < 0) /* you lose out */ 353 if (lstat (name, &savestat) < 0) /* you lose out */
344 ;//next_tty_action = IGNORE; 354 ;//next_tty_action = IGNORE;
345 else 355 else
346# endif 356# endif
347
348 { 357 {
349 chown (name, getuid (), ttyconf.gid); /* fail silently */ 358 chown (name, getuid (), ttyconf.gid); /* fail silently */
350 chmod (name, ttyconf.mode); 359 chmod (name, ttyconf.mode);
351# ifdef HAVE_REVOKE 360# ifdef HAVE_REVOKE
352 revoke (name); 361 revoke (name);
353# endif 362# endif
354
355 } 363 }
356 } 364 }
357 else 365 else
358 { /* action == RESTORE */ 366 { /* action == RESTORE */
359 //next_tty_action = IGNORE; 367 //next_tty_action = IGNORE;
436 } 444 }
437 445
438 return true; 446 return true;
439} 447}
440 448
449void
450rxvt_ptytty::set_utf8_mode (bool on)
451{
452#ifdef IUTF8
453 if (pty != -1)
454 {
455 struct termios tio;
456
457 if (tcgetattr (pty, &tio) != -1)
458 {
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;
469 tcsetattr (pty, TCSANOW, &tio);
470 }
471 }
472 }
473#endif
474}
475
441/*----------------------- end-of-file (C source) -----------------------*/ 476/*----------------------- end-of-file (C source) -----------------------*/
442 477

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines