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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines