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.24 by root, Sat Dec 31 16:06:48 2005 UTC vs.
Revision 1.27 by root, Tue Jan 3 16:32:33 2006 UTC

… …
74get_pty (int *fd_tty, char **ttydev) 74get_pty (int *fd_tty, char **ttydev)
75{ 75{
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 rxvt_privileges(RESTORE);
82 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 82 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
83 rxvt_privileges (IGNORE); 83 rxvt_privileges(IGNORE);
84 84
85 if (res != -1) 85 if (res != -1)
86 { 86 {
87 *ttydev = strdup (tty_name); 87 *ttydev = strdup (tty_name);
88 return pfd; 88 return pfd;
… …
94 if (*ttydev != NULL) 94 if (*ttydev != NULL)
95 return pfd; 95 return pfd;
96#endif 96#endif
97 97
98#ifdef PTYS_ARE_GETPTY 98#ifdef PTYS_ARE_GETPTY
99
100 char *ptydev; 99 char *ptydev;
101 100
102 while ((ptydev = getpty ()) != NULL) 101 while ((ptydev = getpty ()) != NULL)
103 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) 102 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
104 { 103 {
… …
338} ttyconf; 337} ttyconf;
339 338
340void 339void
341rxvt_ptytty::privileges (rxvt_privaction action) 340rxvt_ptytty::privileges (rxvt_privaction action)
342{ 341{
343 if (tty < 0) 342 if (!name || !*name)
344 return; 343 return;
345 344
346 rxvt_privileges (RESTORE); 345 rxvt_privileges (RESTORE);
347 346
348 if (action == SAVE) 347 if (action == SAVE)
349 { 348 {
350 //next_tty_action = RESTORE;
351# ifndef RESET_TTY_TO_COMMON_DEFAULTS 349# ifndef RESET_TTY_TO_COMMON_DEFAULTS
352 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 350 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
353 if (lstat (name, &savestat) < 0) /* you lose out */ 351 if (lstat (name, &savestat) < 0) /* you lose out */
354 ;//next_tty_action = IGNORE; 352 ;
355 else 353 else
356# endif 354# endif
357 { 355 {
356 saved = true;
358 chown (name, getuid (), ttyconf.gid); /* fail silently */ 357 chown (name, getuid (), ttyconf.gid); /* fail silently */
359 chmod (name, ttyconf.mode); 358 chmod (name, ttyconf.mode);
360# ifdef HAVE_REVOKE 359# ifdef HAVE_REVOKE
361 revoke (name); 360 revoke (name);
362# endif 361# endif
363 } 362 }
364 } 363 }
365 else 364 else
366 { /* action == RESTORE */ 365 { /* action == RESTORE */
367 //next_tty_action = IGNORE;
368# ifndef RESET_TTY_TO_COMMON_DEFAULTS 366# ifndef RESET_TTY_TO_COMMON_DEFAULTS
367 if (saved)
368 {
369 chmod (name, savestat.st_mode); 369 chmod (name, savestat.st_mode);
370 chown (name, savestat.st_uid, savestat.st_gid); 370 chown (name, savestat.st_uid, savestat.st_gid);
371 }
371# else 372# else
372 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 373 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
373 chown (name, 0, 0); 374 chown (name, 0, 0);
374# endif 375# endif
375 376
… …
381 382
382rxvt_ptytty::rxvt_ptytty () 383rxvt_ptytty::rxvt_ptytty ()
383{ 384{
384 pty = tty = -1; 385 pty = tty = -1;
385 name = 0; 386 name = 0;
387#ifndef NO_SETOWNER_TTYDEV
388 saved = false;
389#endif
386} 390}
387 391
388rxvt_ptytty::~rxvt_ptytty () 392rxvt_ptytty::~rxvt_ptytty ()
389{ 393{
390 put (); 394 put ();

Diff Legend

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