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

Diff Legend

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