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.31 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.45 by root, Tue Jan 17 18:06:14 2006 UTC

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# include <cstdlib> 27#include <cstdlib>
28# include <cstring> 28#include <cstring>
29 29
30#ifdef HAVE_SYS_TYPES_H
31# include <sys/types.h> 30#include <sys/types.h>
32#endif 31#include <sys/socket.h>
33#ifdef HAVE_UNISTD_H
34# include <unistd.h> 32#include <unistd.h>
35#endif
36#ifdef HAVE_FCNTL_H
37# include <fcntl.h> 33#include <fcntl.h>
38#endif 34
39#ifdef HAVE_SYS_IOCTL_H 35#ifdef HAVE_SYS_IOCTL_H
40# include <sys/ioctl.h> 36# include <sys/ioctl.h>
41#endif 37#endif
42#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
43# include <sys/stropts.h> /* for I_PUSH */ 39# include <sys/stropts.h> /* for I_PUSH */
53# include <util.h> 49# include <util.h>
54#endif 50#endif
55 51
56#include <cstdio> 52#include <cstdio>
57#include <grp.h> 53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58
59/////////////////////////////////////////////////////////////////////////////
58 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
64 * If successful, ttydev is set to the name of the slave device. 66 * If successful, ttydev is set to the name of the slave device.
65 * fd_tty _may_ also be set to an open fd to the slave device 67 * fd_tty _may_ also be set to an open fd to the slave device
66 */ 68 */
67static int 69static inline int
68get_pty (int *fd_tty, char **ttydev) 70get_pty_streams (int *fd_tty, char **ttydev)
69{ 71{
72#ifdef NO_SETOWNER_TTYDEV
70 int pfd; 73 int pfd;
71 74
75# if defined(PTYS_ARE_GETPT)
76 pfd = getpt();
77# elif defined(PTYS_ARE_POSIX)
78 pfd = posix_openpt (O_RDWR);
79# else
80 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
81# endif
82 if (pfd >= 0)
83 {
84 if (grantpt (pfd) == 0 /* change slave permissions */
85 && unlockpt (pfd) == 0)
86 { /* slave now unlocked */
87 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
88 return pfd;
89 }
90
91 close (pfd);
92 }
93#endif
94
95 return -1;
96}
97
98static inline int
99get_pty_openpty (int *fd_tty, char **ttydev)
100{
72#ifdef PTYS_ARE_OPENPTY 101#ifdef PTYS_ARE_OPENPTY
102 int pfd;
103 int res;
73 char tty_name[sizeof "/dev/pts/????\0"]; 104 char tty_name[sizeof "/dev/pts/????\0"];
74 105
75 rxvt_privileges(RESTORE);
76 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 106 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
77 rxvt_privileges(IGNORE);
78
79 if (res != -1) 107 if (res != -1)
80 { 108 {
81 *ttydev = strdup (tty_name); 109 *ttydev = strdup (tty_name);
82 return pfd; 110 return pfd;
83 } 111 }
84#endif 112#endif
85 113
114 return -1;
115}
116
117static inline int
118get_pty__getpty (int *fd_tty, char **ttydev)
119{
86#ifdef PTYS_ARE__GETPTY 120#ifdef PTYS_ARE__GETPTY
121 int pfd;
122
87 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 123 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
88 if (*ttydev != NULL) 124 if (*ttydev != NULL)
89 return pfd; 125 return pfd;
90#endif 126#endif
91 127
92#ifdef PTYS_ARE_GETPTY 128 return -1;
93 char *ptydev; 129}
94 130
95 while ((ptydev = getpty ()) != NULL) 131static inline int
96 if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) 132get_pty_ptc (int *fd_tty, char **ttydev)
97 { 133{
98 *ttydev = ptydev;
99 return pfd;
100 }
101#endif
102
103#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
104# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
105
106 {
107# ifdef PTYS_ARE_GETPT
108 pfd = getpt ();
109# else
110 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
111# endif
112
113 if (pfd >= 0)
114 {
115 if (grantpt (pfd) == 0 /* change slave permissions */
116 && unlockpt (pfd) == 0)
117 { /* slave now unlocked */
118 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
119 return pfd;
120 }
121 close (pfd);
122 }
123 }
124# endif
125#endif
126
127#ifdef PTYS_ARE_PTC 134#ifdef PTYS_ARE_PTC
135 int pfd;
136
128 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 137 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
129 { 138 {
130 *ttydev = strdup (ttyname (pfd)); 139 *ttydev = strdup (ttyname (pfd));
131 return pfd; 140 return pfd;
132 } 141 }
133#endif 142#endif
134 143
144 return -1;
145}
146
147static inline int
148get_pty_clone (int *fd_tty, char **ttydev)
149{
135#ifdef PTYS_ARE_CLONE 150#ifdef PTYS_ARE_CLONE
151 int pfd;
152
136 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 153 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
137 { 154 {
138 *ttydev = strdup (ptsname (pfd)); 155 *ttydev = strdup (ptsname (pfd));
139 return pfd; 156 return pfd;
140 } 157 }
141#endif 158#endif
142 159
160 return -1;
161}
162
163static inline int
164get_pty_numeric (int *fd_tty, char **ttydev)
165{
143#ifdef PTYS_ARE_NUMERIC 166#ifdef PTYS_ARE_NUMERIC
144 { 167 int pfd;
145 int idx; 168 int idx;
146 char *c1, *c2; 169 char *c1, *c2;
147 char pty_name[] = "/dev/ptyp???"; 170 char pty_name[] = "/dev/ptyp???";
148 char tty_name[] = "/dev/ttyp???"; 171 char tty_name[] = "/dev/ttyp???";
149 172
150 c1 = &(pty_name[sizeof (pty_name) - 4]); 173 c1 = &(pty_name[sizeof (pty_name) - 4]);
151 c2 = &(tty_name[sizeof (tty_name) - 4]); 174 c2 = &(tty_name[sizeof (tty_name) - 4]);
175
152 for (idx = 0; idx < 256; idx++) 176 for (idx = 0; idx < 256; idx++)
153 { 177 {
154 sprintf (c1, "%d", idx); 178 sprintf (c1, "%d", idx);
155 sprintf (c2, "%d", idx); 179 sprintf (c2, "%d", idx);
180
156 if (access (tty_name, F_OK) < 0) 181 if (access (tty_name, F_OK) < 0)
157 { 182 {
158 idx = 256; 183 idx = 256;
159 break; 184 break;
160 } 185 }
161 186
162 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) 187 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
163 { 188 {
164 if (access (tty_name, R_OK | W_OK) == 0) 189 if (access (tty_name, R_OK | W_OK) == 0)
165 { 190 {
166 *ttydev = strdup (tty_name); 191 *ttydev = strdup (tty_name);
167 return pfd; 192 return pfd;
168 } 193 }
169 194
170 close (pfd); 195 close (pfd);
171 } 196 }
172 } 197 }
173 }
174#endif 198#endif
175 199
200 return -1;
201}
202
203static inline int
204get_pty_searched (int *fd_tty, char **ttydev)
205{
176#ifdef PTYS_ARE_SEARCHED 206#ifdef PTYS_ARE_SEARCHED
177 {
178 const char *c1, *c2;
179 char pty_name[] = "/dev/pty??";
180 char tty_name[] = "/dev/tty??";
181
182# ifndef PTYCHAR1 207# ifndef PTYCHAR1
183# define PTYCHAR1 "pqrstuvwxyz" 208# define PTYCHAR1 "pqrstuvwxyz"
184# endif 209# endif
185# ifndef PTYCHAR2 210# ifndef PTYCHAR2
186# define PTYCHAR2 "0123456789abcdef" 211# define PTYCHAR2 "0123456789abcdef"
187# endif 212# endif
213 int pfd;
214 const char *c1, *c2;
215 char pty_name[] = "/dev/pty??";
216 char tty_name[] = "/dev/tty??";
188 217
189 for (c1 = PTYCHAR1; *c1; c1++) 218 for (c1 = PTYCHAR1; *c1; c1++)
190 { 219 {
191 pty_name[ (sizeof (pty_name) - 3)] = 220 pty_name[ (sizeof (pty_name) - 3)] =
192 tty_name[ (sizeof (pty_name) - 3)] = *c1; 221 tty_name[ (sizeof (pty_name) - 3)] = *c1;
222
193 for (c2 = PTYCHAR2; *c2; c2++) 223 for (c2 = PTYCHAR2; *c2; c2++)
194 { 224 {
195 pty_name[ (sizeof (pty_name) - 2)] = 225 pty_name[ (sizeof (pty_name) - 2)] =
196 tty_name[ (sizeof (pty_name) - 2)] = *c2; 226 tty_name[ (sizeof (pty_name) - 2)] = *c2;
227
197 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) 228 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
198 { 229 {
199 if (access (tty_name, R_OK | W_OK) == 0) 230 if (access (tty_name, R_OK | W_OK) == 0)
200 { 231 {
201 *ttydev = strdup (tty_name); 232 *ttydev = strdup (tty_name);
202 return pfd; 233 return pfd;
203 } 234 }
204 235
205 close (pfd); 236 close (pfd);
206 } 237 }
207 } 238 }
208 } 239 }
209 }
210#endif 240#endif
241
242 return -1;
243}
244
245static int
246get_pty (int *fd_tty, char **ttydev)
247{
248 int pfd;
249
250 if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
251 || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
252 || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
253 || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
254 || (pfd = get_pty_clone (fd_tty, ttydev)) != -1
255 || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
256 || (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
257 return pfd;
211 258
212 return -1; 259 return -1;
213} 260}
214 261
215/*----------------------------------------------------------------------*/ 262/*----------------------------------------------------------------------*/
225/*----------------------------------------------------------------------*/ 272/*----------------------------------------------------------------------*/
226/* 273/*
227 * Make our tty a controlling tty so that /dev/tty points to us 274 * Make our tty a controlling tty so that /dev/tty points to us
228 */ 275 */
229static int 276static int
230control_tty (int fd_tty, const char *ttydev) 277control_tty (int fd_tty)
231{ 278{
232#ifndef __QNX__
233 int fd;
234
235 /* ---------------------------------------- */
236# ifdef HAVE_SETSID
237 setsid (); 279 setsid ();
238# endif
239# if defined(HAVE_SETPGID)
240 setpgid (0, 0);
241# elif defined(HAVE_SETPGRP)
242 setpgrp (0, 0);
243# endif
244 280
245 /* ---------------------------------------- */
246# ifdef TIOCNOTTY
247 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
248 if (fd >= 0)
249 {
250 ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */
251 close (fd);
252 }
253# endif
254
255 /* ---------------------------------------- */
256 fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
257 if (fd >= 0)
258 close (fd); /* ouch: still have controlling tty */
259
260 /* ---------------------------------------- */
261#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 281# if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
262 /* 282 /*
263 * Push STREAMS modules: 283 * Push STREAMS modules:
264 * ptem: pseudo-terminal hardware emulation module. 284 * ptem: pseudo-terminal hardware emulation module.
265 * ldterm: standard terminal line discipline. 285 * ldterm: standard terminal line discipline.
266 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 286 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
274 * documentation is really unclear about whether it is any close () on 294 * documentation is really unclear about whether it is any close () on
275 * the master side or the last close () - i.e. a proper STREAMS dismantling 295 * the master side or the last close () - i.e. a proper STREAMS dismantling
276 * close () - on the master side which causes a hang up to be sent 296 * close () - on the master side which causes a hang up to be sent
277 * through - Geoff Wing 297 * through - Geoff Wing
278 */ 298 */
279# ifdef HAVE_ISASTREAM 299# ifdef HAVE_ISASTREAM
280 if (isastream (fd_tty) == 1) 300 if (isastream (fd_tty) == 1)
281# endif 301# endif
282 { 302 {
283 ioctl (fd_tty, I_PUSH, "ptem"); 303 ioctl (fd_tty, I_PUSH, "ptem");
284 ioctl (fd_tty, I_PUSH, "ldterm"); 304 ioctl (fd_tty, I_PUSH, "ldterm");
285 ioctl (fd_tty, I_PUSH, "ttcompat"); 305 ioctl (fd_tty, I_PUSH, "ttcompat");
286 } 306 }
287#endif
288 /* ---------------------------------------- */
289# if defined(TIOCSCTTY)
290 fd = ioctl (fd_tty, TIOCSCTTY, NULL);
291# elif defined(TIOCSETCTTY)
292 fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
293# else
294 fd = open (ttydev, O_RDWR);
295 if (fd >= 0)
296 close (fd);
297# endif 307# endif
298 /* ---------------------------------------- */ 308
309 ioctl (fd_tty, TIOCSCTTY, NULL);
310
299 fd = open ("/dev/tty", O_WRONLY); 311 int fd = open ("/dev/tty", O_WRONLY);
300 if (fd < 0) 312 if (fd < 0)
301 return -1; /* fatal */ 313 return -1; /* fatal */
314
302 close (fd); 315 close (fd);
303 /* ---------------------------------------- */
304#endif /* ! __QNX__ */
305 316
306 return 0; 317 return 0;
307} 318}
319
320void
321rxvt_ptytty::close_tty ()
322{
323 if (tty < 0)
324 return;
325
326 close (tty);
327 tty = -1;
328}
329
330bool
331rxvt_ptytty::make_controlling_tty ()
332{
333 return control_tty (tty) >= 0;
334}
335
336void
337rxvt_ptytty::set_utf8_mode (bool on)
338{
339#ifdef IUTF8
340 if (pty < 0)
341 return;
342
343 struct termios tio;
344
345 if (tcgetattr (pty, &tio) != -1)
346 {
347 tcflag_t new_cflag = tio.c_iflag;
348
349 if (on)
350 new_cflag |= IUTF8;
351 else
352 new_cflag &= ~IUTF8;
353
354 if (new_cflag != tio.c_iflag)
355 {
356 tio.c_iflag = new_cflag;
357 tcsetattr (pty, TCSANOW, &tio);
358 }
359 }
360#endif
361}
362
363/////////////////////////////////////////////////////////////////////////////
308 364
309#ifndef NO_SETOWNER_TTYDEV 365#ifndef NO_SETOWNER_TTYDEV
310static struct ttyconf { 366static struct ttyconf {
311 gid_t gid; 367 gid_t gid;
312 mode_t mode; 368 mode_t mode;
328 gid = getgid (); 384 gid = getgid ();
329 } 385 }
330 } 386 }
331} ttyconf; 387} ttyconf;
332 388
389/////////////////////////////////////////////////////////////////////////////
390
333void 391void
334rxvt_ptytty::privileges (rxvt_privaction action) 392rxvt_ptytty_unix::privileges (rxvt_privaction action)
335{ 393{
336 if (!name || !*name) 394 if (!name || !*name)
337 return; 395 return;
338
339 rxvt_privileges (RESTORE);
340 396
341 if (action == SAVE) 397 if (action == SAVE)
342 { 398 {
343# ifndef RESET_TTY_TO_COMMON_DEFAULTS 399# ifndef RESET_TTY_TO_COMMON_DEFAULTS
344 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ 400 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
365 } 421 }
366# else 422# else
367 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 423 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
368 chown (name, 0, 0); 424 chown (name, 0, 0);
369# endif 425# endif
370
371 } 426 }
372
373 rxvt_privileges (IGNORE);
374} 427}
375#endif 428#endif
376 429
377rxvt_ptytty::rxvt_ptytty () 430rxvt_ptytty_unix::rxvt_ptytty_unix ()
378{ 431{
379 pty = tty = -1; 432 pty = tty = -1;
380 name = 0; 433 name = 0;
381#ifndef NO_SETOWNER_TTYDEV 434#ifndef NO_SETOWNER_TTYDEV
382 saved = false; 435 saved = false;
383#endif 436#endif
437#if UTMP_SUPPORT
438 cmd_pid = 0;
439#endif
384} 440}
385 441
386rxvt_ptytty::~rxvt_ptytty () 442rxvt_ptytty_unix::~rxvt_ptytty_unix ()
387{ 443{
444#if UTMP_SUPPORT
445 logout ();
446#endif
388 put (); 447 put ();
389} 448}
390 449
391void 450void
392
393rxvt_ptytty::close_tty ()
394{
395 if (tty < 0)
396 return;
397
398 close (tty);
399 tty = -1;
400}
401
402void
403rxvt_ptytty::put () 451rxvt_ptytty_unix::put ()
404{ 452{
405#ifndef NO_SETOWNER_TTYDEV 453#ifndef NO_SETOWNER_TTYDEV
406 privileges (RESTORE); 454 privileges (RESTORE);
407#endif 455#endif
408 456
413 pty = tty = -1; 461 pty = tty = -1;
414 name = 0; 462 name = 0;
415} 463}
416 464
417bool 465bool
418rxvt_ptytty::make_controlling_tty ()
419{
420 return control_tty (tty, name) >= 0;
421}
422
423bool
424rxvt_ptytty::get () 466rxvt_ptytty_unix::get ()
425{ 467{
426 /* get master (pty) */ 468 /* get master (pty) */
427 if ((pty = get_pty (&tty, &name)) < 0) 469 if ((pty = get_pty (&tty, &name)) < 0)
428 return false; 470 return false;
429 471
444 } 486 }
445 487
446 return true; 488 return true;
447} 489}
448 490
491#if PTYTTY_HELPER
492
493static int sock_fd;
494static int pid;
495
496struct command
497{
498 enum { get, login, destroy } type;
499
500 rxvt_ptytty *id;
501
502 bool login_shell;
503 int cmd_pid;
504 char hostname[512]; // arbitrary, but should be plenty
505};
506
507struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
508{
509 rxvt_ptytty *id;
510
511 ~rxvt_ptytty_proxy ();
512
513 bool get ();
514 void login (int cmd_pid, bool login_shell, const char *hostname);
515};
516
517bool
518rxvt_ptytty_proxy::get ()
519{
520 command cmd;
521
522 cmd.type = command::get;
523
524 write (sock_fd, &cmd, sizeof (cmd));
525
526 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
527 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
528
529 if (!id)
530 return false;
531
532 if ((pty = rxvt_recv_fd (sock_fd)) < 0
533 || (tty = rxvt_recv_fd (sock_fd)) < 0)
534 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
535
536 return true;
537}
538
449void 539void
450rxvt_ptytty::set_utf8_mode (bool on) 540rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
451{ 541{
452#ifdef IUTF8 542 command cmd;
453 if (pty < 0)
454 return;
455 543
456 struct termios tio; 544 cmd.type = command::login;
545 cmd.id = id;
546 cmd.cmd_pid = cmd_pid;
547 cmd.login_shell = login_shell;
548 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
457 549
458 if (tcgetattr (pty, &tio) != -1) 550 write (sock_fd, &cmd, sizeof (cmd));
459 { 551}
460 tcflag_t new_cflag = tio.c_iflag;
461 552
462 if (on) 553rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
463 new_cflag |= IUTF8; 554{
555 command cmd;
556
557 cmd.type = command::destroy;
558 cmd.id = id;
559
560 write (sock_fd, &cmd, sizeof (cmd));
561}
562
563static
564void serve ()
565{
566 command cmd;
567 vector<rxvt_ptytty *> ptys;
568
569 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
570 {
571 if (cmd.type == command::get)
572 {
573 // -> id ptyfd ttyfd
574 cmd.id = new rxvt_ptytty_unix;
575
576 if (cmd.id->get ())
577 {
578 write (sock_fd, &cmd.id, sizeof (cmd.id));
579 ptys.push_back (cmd.id);
580
581 rxvt_send_fd (sock_fd, cmd.id->pty);
582 rxvt_send_fd (sock_fd, cmd.id->tty);
583 }
584 else
585 {
586 delete cmd.id;
587 cmd.id = 0;
588 write (sock_fd, &cmd.id, sizeof (cmd.id));
589 }
590 }
591 else if (cmd.type == command::login)
592 {
593#if UTMP_SUPPORT
594 if (find (ptys.begin (), ptys.end (), cmd.id))
595 {
596 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
597 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
598 }
599#endif
600 }
601 else if (cmd.type == command::destroy)
602 {
603 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
604
605 if (pty)
606 {
607 delete *pty;
608 ptys.erase (pty);
609 }
610 }
464 else 611 else
465 new_cflag &= ~IUTF8; 612 break;
613 }
466 614
467 if (new_cflag != tio.c_iflag) 615 // destroy all ptys
468 { 616 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
469 tio.c_iflag = new_cflag; 617 delete *i;
470 tcsetattr (pty, TCSANOW, &tio); 618}
471 } 619
620void rxvt_ptytty_server ()
621{
622 int sv[2];
623
624 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
625 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
626
627 pid = fork ();
628
629 if (pid < 0)
630 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
631
632 if (pid)
472 } 633 {
634 // client, urxvt
635 sock_fd = sv[0];
636 close (sv[1]);
637 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
638 }
639 else
640 {
641 setgid (getegid ());
642 setuid (geteuid ());
643
644 // server, pty-helper
645 sock_fd = sv[1];
646
647 for (int fd = 0; fd < 1023; fd++)
648 if (fd != sock_fd && fd != 1)
649 close (fd);
650
651 serve ();
652 _exit (EXIT_SUCCESS);
653 }
654}
473#endif 655#endif
656
657// a "factory" *g*
658rxvt_ptytty *
659rxvt_new_ptytty ()
660{
661#if PTYTTY_HELPER
662 if (pid > 0)
663 // use helper process
664 return new rxvt_ptytty_proxy;
665 else
666#endif
667 return new rxvt_ptytty_unix;
474} 668}
475 669
476/*----------------------- end-of-file (C source) -----------------------*/ 670/*----------------------- end-of-file (C source) -----------------------*/
477 671

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines