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.47 by root, Thu Jan 19 10:27:27 2006 UTC vs.
Revision 1.54 by root, Sun Jan 22 00:48:13 2006 UTC

… …
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 22 *---------------------------------------------------------------------*/
23 23
24#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
25
26#include "fdpass.h"
25#include "rxvt.h" 27#include "ptytty.h"
26 28
27#include <cstdlib> 29#include <cstdlib>
28#include <cstring> 30#include <cstring>
29 31
30#include <sys/types.h> 32#include <sys/types.h>
… …
33#include <fcntl.h> 35#include <fcntl.h>
34 36
35#ifdef HAVE_SYS_IOCTL_H 37#ifdef HAVE_SYS_IOCTL_H
36# include <sys/ioctl.h> 38# include <sys/ioctl.h>
37#endif 39#endif
38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 40#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39# include <sys/stropts.h> /* for I_PUSH */ 41# include <sys/stropts.h> /* for I_PUSH */
40#endif 42#endif
41#ifdef HAVE_ISASTREAM 43#ifdef HAVE_ISASTREAM
42# include <stropts.h> 44# include <stropts.h>
43#endif 45#endif
… …
46#elif defined(HAVE_LIBUTIL_H) 48#elif defined(HAVE_LIBUTIL_H)
47# include <libutil.h> 49# include <libutil.h>
48#elif defined(HAVE_UTIL_H) 50#elif defined(HAVE_UTIL_H)
49# include <util.h> 51# include <util.h>
50#endif 52#endif
53#ifdef TTY_GID_SUPPORT
54#include <grp.h>
55#endif
51 56
52#include <cstdio> 57#include <cstdio>
53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58 58
59///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
60 60
61/* ------------------------------------------------------------------------- * 61/* ------------------------------------------------------------------------- *
62 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 62 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
… …
64/* 64/*
65 * Returns pty file descriptor, or -1 on failure 65 * Returns pty file descriptor, or -1 on failure
66 * 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.
67 * 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
68 */ 68 */
69static inline int 69#if defined(UNIX98_PTY)
70static int
70get_pty_streams (int *fd_tty, char **ttydev) 71get_pty (int *fd_tty, char **ttydev)
71{ 72{
72#ifdef NO_SETOWNER_TTYDEV
73 int pfd; 73 int pfd;
74 74
75# if defined(PTYS_ARE_GETPT) 75# if defined(HAVE_GETPT)
76 pfd = getpt(); 76 pfd = getpt();
77# elif defined(PTYS_ARE_POSIX) 77# elif defined(HAVE_POSIX_OPENPT)
78 pfd = posix_openpt (O_RDWR); 78 pfd = posix_openpt (O_RDWR);
79# else 79# else
80 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 80 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
81# endif 81# endif
82 if (pfd >= 0) 82 if (pfd >= 0)
83 { 83 {
84 if (grantpt (pfd) == 0 /* change slave permissions */ 84 if (grantpt (pfd) == 0 /* change slave permissions */
85 && unlockpt (pfd) == 0) 85 && unlockpt (pfd) == 0)
… …
88 return pfd; 88 return pfd;
89 } 89 }
90 90
91 close (pfd); 91 close (pfd);
92 } 92 }
93#endif
94 93
95 return -1; 94 return -1;
96} 95}
97 96#elif defined(HAVE_OPENPTY)
98static inline int 97static int
99get_pty_openpty (int *fd_tty, char **ttydev) 98get_pty (int *fd_tty, char **ttydev)
100{ 99{
101#ifdef PTYS_ARE_OPENPTY
102 int pfd; 100 int pfd;
103 int res; 101 int res;
104 char tty_name[sizeof "/dev/pts/????\0"]; 102 char tty_name[32];
105 103
106 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 104 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
107 if (res != -1) 105 if (res != -1)
108 { 106 {
109 *ttydev = strdup (tty_name); 107 *ttydev = strdup (tty_name);
110 return pfd; 108 return pfd;
111 } 109 }
112#endif
113 110
114 return -1; 111 return -1;
115} 112}
116 113#elif defined(HAVE__GETPTY)
117static inline int 114static int
118get_pty__getpty (int *fd_tty, char **ttydev) 115get_pty (int *fd_tty, char **ttydev)
119{ 116{
120#ifdef PTYS_ARE__GETPTY
121 int pfd; 117 int pfd;
122 118
123 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 119 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
124 if (*ttydev != NULL) 120 if (*ttydev != NULL)
125 return pfd; 121 return pfd;
126#endif
127 122
128 return -1; 123 return -1;
129} 124}
130 125#elif defined(HAVE_DEV_PTC)
131static inline int 126static int
132get_pty_ptc (int *fd_tty, char **ttydev) 127get_pty (int *fd_tty, char **ttydev)
133{ 128{
134#ifdef PTYS_ARE_PTC
135 int pfd; 129 int pfd;
136 130
137 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 131 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
138 { 132 {
139 *ttydev = strdup (ttyname (pfd)); 133 *ttydev = strdup (ttyname (pfd));
140 return pfd; 134 return pfd;
141 } 135 }
142#endif
143 136
144 return -1; 137 return -1;
145} 138}
146 139#elif defined(HAVE_DEV_CLONE)
147static inline int 140static int
148get_pty_clone (int *fd_tty, char **ttydev) 141get_pty (int *fd_tty, char **ttydev)
149{ 142{
150#ifdef PTYS_ARE_CLONE
151 int pfd; 143 int pfd;
152 144
153 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 145 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
154 { 146 {
155 *ttydev = strdup (ptsname (pfd)); 147 *ttydev = strdup (ptsname (pfd));
156 return pfd; 148 return pfd;
157 } 149 }
158#endif
159 150
160 return -1; 151 return -1;
161} 152}
162 153#else
163static inline int 154/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
155static int
164get_pty_numeric (int *fd_tty, char **ttydev) 156get_pty (int *fd_tty, char **ttydev)
165{ 157{
166#ifdef PTYS_ARE_NUMERIC
167 int pfd; 158 int pfd;
168 int idx; 159 int i;
169 char *c1, *c2; 160 char pty_name[32];
170 char pty_name[] = "/dev/ptyp???"; 161 char tty_name[32];
171 char tty_name[] = "/dev/ttyp???"; 162 const char *majors = "pqrstuvwxyzabcde";
172 163 const char *minors = "0123456789abcdef";
173 c1 = &(pty_name[sizeof (pty_name) - 4]);
174 c2 = &(tty_name[sizeof (tty_name) - 4]);
175
176 for (idx = 0; idx < 256; idx++) 164 for (i = 0; i < 256; i++)
177 { 165 {
178 sprintf (c1, "%d", idx); 166 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
179 sprintf (c2, "%d", idx); 167 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
180
181 if (access (tty_name, F_OK) < 0)
182 {
183 idx = 256;
184 break;
185 }
186
187 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) 168 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
169 {
170 snprintf(pty_name, 32, "/dev/ptyp%d", i);
171 snprintf(tty_name, 32, "/dev/ttyp%d", i);
172 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
173 continue;
188 { 174 }
189 if (access (tty_name, R_OK | W_OK) == 0) 175 if (access (tty_name, R_OK | W_OK) == 0)
190 { 176 {
191 *ttydev = strdup (tty_name); 177 *ttydev = strdup (tty_name);
192 return pfd; 178 return pfd;
193 } 179 }
194 180
195 close (pfd); 181 close (pfd);
196 }
197 } 182 }
198#endif
199
200 return -1;
201} 183}
202
203static inline int
204get_pty_searched (int *fd_tty, char **ttydev)
205{
206#ifdef PTYS_ARE_SEARCHED
207# ifndef PTYCHAR1
208# define PTYCHAR1 "pqrstuvwxyz"
209# endif 184#endif
210# ifndef PTYCHAR2
211# define PTYCHAR2 "0123456789abcdef"
212# endif
213 int pfd;
214 const char *c1, *c2;
215 char pty_name[] = "/dev/pty??";
216 char tty_name[] = "/dev/tty??";
217
218 for (c1 = PTYCHAR1; *c1; c1++)
219 {
220 pty_name[ (sizeof (pty_name) - 3)] =
221 tty_name[ (sizeof (pty_name) - 3)] = *c1;
222
223 for (c2 = PTYCHAR2; *c2; c2++)
224 {
225 pty_name[ (sizeof (pty_name) - 2)] =
226 tty_name[ (sizeof (pty_name) - 2)] = *c2;
227
228 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
229 {
230 if (access (tty_name, R_OK | W_OK) == 0)
231 {
232 *ttydev = strdup (tty_name);
233 return pfd;
234 }
235
236 close (pfd);
237 }
238 }
239 }
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;
258
259 return -1;
260}
261 185
262/*----------------------------------------------------------------------*/ 186/*----------------------------------------------------------------------*/
263/* 187/*
264 * Returns tty file descriptor, or -1 on failure 188 * Returns tty file descriptor, or -1 on failure
265 */ 189 */
… …
276static int 200static int
277control_tty (int fd_tty) 201control_tty (int fd_tty)
278{ 202{
279 setsid (); 203 setsid ();
280 204
281#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 205#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
282 /* 206 /*
283 * Push STREAMS modules: 207 * Push STREAMS modules:
284 * ptem: pseudo-terminal hardware emulation module. 208 * ptem: pseudo-terminal hardware emulation module.
285 * ldterm: standard terminal line discipline. 209 * ldterm: standard terminal line discipline.
286 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 210 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
316 240
317 return 0; 241 return 0;
318} 242}
319 243
320void 244void
321rxvt_ptytty::close_tty () 245ptytty::close_tty ()
322{ 246{
323 if (tty < 0) 247 if (tty < 0)
324 return; 248 return;
325 249
326 close (tty); 250 close (tty);
327 tty = -1; 251 tty = -1;
328} 252}
329 253
330bool 254bool
331rxvt_ptytty::make_controlling_tty () 255ptytty::make_controlling_tty ()
332{ 256{
333 return control_tty (tty) >= 0; 257 return control_tty (tty) >= 0;
334} 258}
335 259
336void 260void
337rxvt_ptytty::set_utf8_mode (bool on) 261ptytty::set_utf8_mode (bool on)
338{ 262{
339#ifdef IUTF8 263#ifdef IUTF8
340 if (pty < 0) 264 if (pty < 0)
341 return; 265 return;
342 266
… …
358 } 282 }
359 } 283 }
360#endif 284#endif
361} 285}
362 286
363/////////////////////////////////////////////////////////////////////////////
364
365#ifndef NO_SETOWNER_TTYDEV
366static struct ttyconf { 287static struct ttyconf {
367 gid_t gid; 288 gid_t gid;
368 mode_t mode; 289 mode_t mode;
369 290
370 ttyconf () 291 ttyconf ()
… …
379 } 300 }
380 else 301 else
381#endif /* TTY_GID_SUPPORT */ 302#endif /* TTY_GID_SUPPORT */
382 { 303 {
383 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 304 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
384 gid = getgid (); 305 gid = 0;
385 } 306 }
386 } 307 }
387} ttyconf; 308} ttyconf;
388 309
389///////////////////////////////////////////////////////////////////////////// 310ptytty_unix::ptytty_unix ()
311{
312 name = 0;
313#if UTMP_SUPPORT
314 cmd_pid = 0;
315#endif
316}
317
318ptytty_unix::~ptytty_unix ()
319{
320#if UTMP_SUPPORT
321 logout ();
322#endif
323 put ();
324}
390 325
391void 326void
392rxvt_ptytty_unix::privileges (rxvt_privaction action) 327ptytty_unix::put ()
393{ 328{
394 if (!name || !*name) 329 chmod (name, RESTORE_TTY_MODE);
395 return; 330 chown (name, 0, ttyconf.gid);
396 331
397 if (action == SAVE) 332 close_tty ();
398 {
399# ifndef RESET_TTY_TO_COMMON_DEFAULTS
400 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
401 if (lstat (name, &savestat) < 0) /* you lose out */
402 ;
403 else
404# endif
405 {
406 saved = true;
407 chown (name, getuid (), ttyconf.gid); /* fail silently */
408 chmod (name, ttyconf.mode);
409# ifdef HAVE_REVOKE
410 revoke (name);
411# endif
412 }
413 }
414 else
415 { /* action == RESTORE */
416# ifndef RESET_TTY_TO_COMMON_DEFAULTS
417 if (saved)
418 {
419 chmod (name, savestat.st_mode);
420 chown (name, savestat.st_uid, savestat.st_gid);
421 }
422# else
423 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
424 chown (name, 0, 0);
425# endif
426 }
427}
428#endif
429 333
430rxvt_ptytty_unix::rxvt_ptytty_unix () 334 if (pty >= 0)
431{ 335 close (pty);
336
337 free (name);
338
432 pty = tty = -1; 339 pty = tty = -1;
433 name = 0; 340 name = 0;
434#ifndef NO_SETOWNER_TTYDEV
435 saved = false;
436#endif
437#if UTMP_SUPPORT
438 cmd_pid = 0;
439#endif
440}
441
442rxvt_ptytty_unix::~rxvt_ptytty_unix ()
443{
444#if UTMP_SUPPORT
445 logout ();
446#endif
447 put ();
448}
449
450void
451rxvt_ptytty_unix::put ()
452{
453#ifndef NO_SETOWNER_TTYDEV
454 privileges (RESTORE);
455#endif
456
457 if (pty >= 0) close (pty);
458 close_tty ();
459 free (name);
460
461 pty = tty = -1;
462 name = 0;
463} 341}
464 342
465bool 343bool
466rxvt_ptytty_unix::get () 344ptytty_unix::get ()
467{ 345{
468 /* get master (pty) */ 346 /* get master (pty) */
469 if ((pty = get_pty (&tty, &name)) < 0) 347 if ((pty = get_pty (&tty, &name)) < 0)
470 return false; 348 return false;
471 349
… …
473 351
474 /* get slave (tty) */ 352 /* get slave (tty) */
475 if (tty < 0) 353 if (tty < 0)
476 { 354 {
477#ifndef NO_SETOWNER_TTYDEV 355#ifndef NO_SETOWNER_TTYDEV
478 privileges (SAVE); 356 chown (name, getuid (), ttyconf.gid); /* fail silently */
357 chmod (name, ttyconf.mode);
358# ifdef HAVE_REVOKE
359 revoke (name);
360# endif
479#endif 361#endif
480 362
481 if ((tty = get_tty (name)) < 0) 363 if ((tty = get_tty (name)) < 0)
482 { 364 {
483 put (); 365 put ();
… …
495 377
496struct command 378struct command
497{ 379{
498 enum { get, login, destroy } type; 380 enum { get, login, destroy } type;
499 381
500 rxvt_ptytty *id; 382 ptytty *id;
501 383
502 bool login_shell; 384 bool login_shell;
503 int cmd_pid; 385 int cmd_pid;
504 char hostname[512]; // arbitrary, but should be plenty 386 char hostname[512]; // arbitrary, but should be plenty
505}; 387};
506 388
507struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 389struct ptytty_proxy : ptytty
508{ 390{
509 rxvt_ptytty *id; 391 ptytty *id;
510 392
393 ptytty_proxy ()
394 : id(0)
395 {
396 }
397
511 ~rxvt_ptytty_proxy (); 398 ~ptytty_proxy ();
512 399
513 bool get (); 400 bool get ();
514 void login (int cmd_pid, bool login_shell, const char *hostname); 401 void login (int cmd_pid, bool login_shell, const char *hostname);
515}; 402};
516 403
517bool 404bool
518rxvt_ptytty_proxy::get () 405ptytty_proxy::get ()
519{ 406{
520 command cmd; 407 command cmd;
521 408
522 cmd.type = command::get; 409 cmd.type = command::get;
523 410
524 write (sock_fd, &cmd, sizeof (cmd)); 411 write (sock_fd, &cmd, sizeof (cmd));
525 412
526 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 413 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
527 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); 414 fatal ("protocol error while creating pty using helper process, aborting.\n");
528 415
529 if (!id) 416 if (!id)
530 return false; 417 return false;
531 418
532 if ((pty = rxvt_recv_fd (sock_fd)) < 0 419 if ((pty = ptytty_recv_fd (sock_fd)) < 0
533 || (tty = rxvt_recv_fd (sock_fd)) < 0) 420 || (tty = ptytty_recv_fd (sock_fd)) < 0)
534 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); 421 fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
535 422
536 return true; 423 return true;
537} 424}
538 425
539void 426void
540rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 427ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
541{ 428{
542 command cmd; 429 command cmd;
543 430
544 cmd.type = command::login; 431 cmd.type = command::login;
545 cmd.id = id; 432 cmd.id = id;
… …
548 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 435 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
549 436
550 write (sock_fd, &cmd, sizeof (cmd)); 437 write (sock_fd, &cmd, sizeof (cmd));
551} 438}
552 439
553rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 440ptytty_proxy::~ptytty_proxy ()
554{ 441{
442 if (id)
443 {
555 command cmd; 444 command cmd;
556 445
557 cmd.type = command::destroy; 446 cmd.type = command::destroy;
558 cmd.id = id; 447 cmd.id = id;
559 448
560 write (sock_fd, &cmd, sizeof (cmd)); 449 write (sock_fd, &cmd, sizeof (cmd));
450 }
561} 451}
562 452
563static 453static
564void serve () 454void serve ()
565{ 455{
566 command cmd; 456 command cmd;
567 vector<rxvt_ptytty *> ptys; 457 vector<ptytty *> ptys;
568 458
569 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 459 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
570 { 460 {
571 if (cmd.type == command::get) 461 if (cmd.type == command::get)
572 { 462 {
573 // -> id ptyfd ttyfd 463 // -> id ptyfd ttyfd
574 cmd.id = new rxvt_ptytty_unix; 464 cmd.id = new ptytty_unix;
575 465
576 if (cmd.id->get ()) 466 if (cmd.id->get ())
577 { 467 {
578 write (sock_fd, &cmd.id, sizeof (cmd.id)); 468 write (sock_fd, &cmd.id, sizeof (cmd.id));
579 ptys.push_back (cmd.id); 469 ptys.push_back (cmd.id);
580 470
581 rxvt_send_fd (sock_fd, cmd.id->pty); 471 ptytty_send_fd (sock_fd, cmd.id->pty);
582 rxvt_send_fd (sock_fd, cmd.id->tty); 472 ptytty_send_fd (sock_fd, cmd.id->tty);
583 } 473 }
584 else 474 else
585 { 475 {
586 delete cmd.id; 476 delete cmd.id;
587 cmd.id = 0; 477 cmd.id = 0;
… …
598 } 488 }
599#endif 489#endif
600 } 490 }
601 else if (cmd.type == command::destroy) 491 else if (cmd.type == command::destroy)
602 { 492 {
603 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 493 ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
604 494
605 if (pty) 495 if (pty)
606 { 496 {
607 delete *pty; 497 delete *pty;
608 ptys.erase (pty); 498 ptys.erase (pty);
… …
611 else 501 else
612 break; 502 break;
613 } 503 }
614 504
615 // destroy all ptys 505 // destroy all ptys
616 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 506 for (ptytty **i = ptys.end (); i-- > ptys.begin (); )
617 delete *i; 507 delete *i;
618} 508}
619 509
620void rxvt_ptytty_server () 510void ptytty_server ()
621{ 511{
622 int sv[2]; 512 int sv[2];
623 513
624 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 514 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
625 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); 515 fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
626 516
627 pid = fork (); 517 pid = fork ();
628 518
629 if (pid < 0) 519 if (pid < 0)
630 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 520 fatal ("could not create pty/sessiondb helper process, aborting.\n");
631 521
632 if (pid) 522 if (pid)
633 { 523 {
634 // client, urxvt 524 // client, process
635 sock_fd = sv[0]; 525 sock_fd = sv[0];
636 close (sv[1]); 526 close (sv[1]);
637 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 527 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
638 } 528 }
639 else 529 else
… …
647 537
648 serve (); 538 serve ();
649 _exit (EXIT_SUCCESS); 539 _exit (EXIT_SUCCESS);
650 } 540 }
651} 541}
542
652#endif 543#endif
653 544
654// a "factory" *g* 545// a "factory" *g*
655rxvt_ptytty * 546ptytty *
656rxvt_new_ptytty () 547new_ptytty ()
657{ 548{
658#if PTYTTY_HELPER 549#if PTYTTY_HELPER
659 if (pid > 0) 550 if (pid > 0)
660 // use helper process 551 // use helper process
661 return new rxvt_ptytty_proxy; 552 return new ptytty_proxy;
662 else 553 else
663#endif 554#endif
664 return new rxvt_ptytty_unix; 555 return new ptytty_unix;
665} 556}
666 557
667/*----------------------- end-of-file (C source) -----------------------*/ 558/*----------------------- end-of-file (C source) -----------------------*/
668 559

Diff Legend

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