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.40 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.66 by ayin, Thu Jun 28 17:47:14 2007 UTC

1// This file is part of libptytty. Do not make local modifications.
2// http://software.schmorp.de/pkg/libptytty
3
1/*--------------------------------*-C-*---------------------------------* 4/*----------------------------------------------------------------------*
2 * File: ptytty.C 5 * File: ptytty.C
3 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
4 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> 10 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
11 * Copyright (c) 2006 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 12 *
9 * This program is free software; you can redistribute it and/or modify 13 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 14 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 15 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 16 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 23 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 24 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 25 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 26 *---------------------------------------------------------------------*/
23 27
24#include "../config.h" /* NECESSARY */ 28#include "../config.h"
29
25#include "rxvt.h" 30#include "ptytty.h"
26 31
27#include <cstdlib> 32#include <cstdlib>
28#include <cstring> 33#include <cstring>
34#include <csignal>
29 35
30#include <sys/types.h> 36#include <sys/types.h>
31#include <sys/socket.h>
32#include <unistd.h> 37#include <unistd.h>
33#include <fcntl.h> 38#include <fcntl.h>
34 39
35#ifdef HAVE_SYS_IOCTL_H 40#ifdef HAVE_SYS_IOCTL_H
36# include <sys/ioctl.h> 41# include <sys/ioctl.h>
37#endif 42#endif
38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 43#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39# include <sys/stropts.h> /* for I_PUSH */ 44# include <sys/stropts.h> /* for I_PUSH */
40#endif 45#endif
41#ifdef HAVE_ISASTREAM 46#ifdef HAVE_ISASTREAM
42# include <stropts.h> 47# include <stropts.h>
43#endif 48#endif
… …
46#elif defined(HAVE_LIBUTIL_H) 51#elif defined(HAVE_LIBUTIL_H)
47# include <libutil.h> 52# include <libutil.h>
48#elif defined(HAVE_UTIL_H) 53#elif defined(HAVE_UTIL_H)
49# include <util.h> 54# include <util.h>
50#endif 55#endif
56#ifdef TTY_GID_SUPPORT
57#include <grp.h>
58#endif
51 59
52#include <cstdio> 60#include <cstdio>
53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58 61
59///////////////////////////////////////////////////////////////////////////// 62/////////////////////////////////////////////////////////////////////////////
60 63
61/* ------------------------------------------------------------------------- * 64/* ------------------------------------------------------------------------- *
62 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 65 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
63 * ------------------------------------------------------------------------- */ 66 * ------------------------------------------------------------------------- */
64/* 67/*
65 * Returns pty file descriptor, or -1 on failure 68 * Returns pty file descriptor, or -1 on failure
66 * If successful, ttydev is set to the name of the slave device. 69 * 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 70 * fd_tty _may_ also be set to an open fd to the slave device
68 */ 71 */
72#if defined(UNIX98_PTY)
73
69static int 74 static int
70get_pty (int *fd_tty, char **ttydev) 75 get_pty (int *fd_tty, char **ttydev)
71{ 76 {
72 int pfd; 77 int pfd;
73 78
74#ifdef PTYS_ARE_OPENPTY 79# if defined(HAVE_GETPT)
75 char tty_name[sizeof "/dev/pts/????\0"];
76
77 rxvt_privileges(RESTORE);
78 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79 rxvt_privileges(IGNORE);
80
81 if (res != -1)
82 {
83 *ttydev = strdup (tty_name);
84 return pfd;
85 }
86#endif
87
88#ifdef PTYS_ARE__GETPTY
89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
90 if (*ttydev != NULL)
91 return pfd;
92#endif
93
94#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
95# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
96
97 {
98# ifdef PTYS_ARE_GETPT
99 pfd = getpt(); 80 pfd = getpt();
100# else 81# elif defined(HAVE_POSIX_OPENPT)
101# ifdef PTYS_ARE_POSIX
102 pfd = posix_openpt (O_RDWR); 82 pfd = posix_openpt (O_RDWR);
103# else 83# else
104 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 84 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
105# endif 85# endif
106# endif
107 86
108 if (pfd >= 0) 87 if (pfd >= 0)
109 { 88 {
110 if (grantpt (pfd) == 0 /* change slave permissions */ 89 if (grantpt (pfd) == 0 /* change slave permissions */
111 && unlockpt (pfd) == 0) 90 && unlockpt (pfd) == 0)
112 { /* slave now unlocked */ 91 { /* slave now unlocked */
113 *ttydev = strdup (ptsname (pfd)); /* get slave's name */ 92 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
114 return pfd; 93 return pfd;
115 } 94 }
95
116 close (pfd); 96 close (pfd);
117 } 97 }
118 }
119# endif
120#endif
121 98
122#ifdef PTYS_ARE_PTC 99 return -1;
123 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 100 }
101
102#elif defined(HAVE_OPENPTY)
103
104 static int
105 get_pty (int *fd_tty, char **ttydev)
106 {
107 int pfd;
108 int res;
109
110 res = openpty (&pfd, fd_tty, NULL, NULL, NULL);
111
112 if (res != -1)
124 { 113 {
125 *ttydev = strdup (ttyname (pfd)); 114 *ttydev = strdup (ttyname (*fd_tty));
115 return pfd;
116 }
117
118 return -1;
119 }
120
121#elif defined(HAVE__GETPTY)
122
123 static int
124 get_pty (int *fd_tty, char **ttydev)
125 {
126 int pfd;
127 char *slave;
128
129 slave = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
130
131 if (slave != NULL) {
132 *ttydev = strdup (slave);
126 return pfd; 133 return pfd;
127 } 134 }
128#endif
129 135
130#ifdef PTYS_ARE_CLONE 136 return -1;
137 }
138
139#elif defined(HAVE_DEV_PTC)
140
141 static int
142 get_pty (int *fd_tty, char **ttydev)
143 {
144 int pfd;
145
131 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 146 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
132 {
133 *ttydev = strdup (ptsname (pfd));
134 return pfd;
135 }
136#endif
137
138#ifdef PTYS_ARE_NUMERIC
139 {
140 int idx;
141 char *c1, *c2;
142 char pty_name[] = "/dev/ptyp???";
143 char tty_name[] = "/dev/ttyp???";
144
145 c1 = &(pty_name[sizeof (pty_name) - 4]);
146 c2 = &(tty_name[sizeof (tty_name) - 4]);
147 for (idx = 0; idx < 256; idx++)
148 { 147 {
149 sprintf (c1, "%d", idx); 148 *ttydev = strdup (ttyname (pfd));
150 sprintf (c2, "%d", idx); 149 return pfd;
151 if (access (tty_name, F_OK) < 0) 150 }
151
152 return -1;
153 }
154
155#elif defined(HAVE_DEV_CLONE)
156
157 static int
158 get_pty (int *fd_tty, char **ttydev)
159 {
160 int pfd;
161
162 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
163 {
164 *ttydev = strdup (ptsname (pfd));
165 return pfd;
166 }
167
168 return -1;
169 }
170
171#else
172
173 /* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
174 static int
175 get_pty (int *fd_tty, char **ttydev)
176 {
177 int pfd;
178 int i;
179 char pty_name[32];
180 char tty_name[32];
181 const char *majors = "pqrstuvwxyzabcde";
182 const char *minors = "0123456789abcdef";
183
184 for (i = 0; i < 256; i++)
185 {
186 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
187 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
188
189 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
152 { 190 {
153 idx = 256; 191 snprintf(pty_name, 32, "/dev/ptyp%d", i);
154 break; 192 snprintf(tty_name, 32, "/dev/ttyp%d", i);
193 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
194 continue;
155 } 195 }
156 196
157 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) 197 if (access (tty_name, R_OK | W_OK) == 0)
158 { 198 {
159 if (access (tty_name, R_OK | W_OK) == 0)
160 {
161 *ttydev = strdup (tty_name); 199 *ttydev = strdup (tty_name);
162 return pfd; 200 return pfd;
163 }
164
165 close (pfd);
166 } 201 }
202
203 close (pfd);
167 } 204 }
168 }
169#endif
170 205
171#ifdef PTYS_ARE_SEARCHED
172 {
173 const char *c1, *c2;
174 char pty_name[] = "/dev/pty??";
175 char tty_name[] = "/dev/tty??";
176
177# ifndef PTYCHAR1
178# define PTYCHAR1 "pqrstuvwxyz"
179# endif
180# ifndef PTYCHAR2
181# define PTYCHAR2 "0123456789abcdef"
182# endif
183
184 for (c1 = PTYCHAR1; *c1; c1++)
185 {
186 pty_name[ (sizeof (pty_name) - 3)] =
187 tty_name[ (sizeof (pty_name) - 3)] = *c1;
188 for (c2 = PTYCHAR2; *c2; c2++)
189 {
190 pty_name[ (sizeof (pty_name) - 2)] =
191 tty_name[ (sizeof (pty_name) - 2)] = *c2;
192 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
193 {
194 if (access (tty_name, R_OK | W_OK) == 0)
195 {
196 *ttydev = strdup (tty_name);
197 return pfd;
198 }
199
200 close (pfd);
201 }
202 }
203 }
204 }
205#endif
206
207 return -1; 206 return -1;
208} 207 }
208
209#endif
209 210
210/*----------------------------------------------------------------------*/ 211/*----------------------------------------------------------------------*/
211/* 212/*
212 * Returns tty file descriptor, or -1 on failure 213 * Returns tty file descriptor, or -1 on failure
213 */ 214 */
214static int 215static int
215get_tty (char *ttydev) 216get_tty (char *ttydev)
216{ 217{
217 return open (ttydev, O_RDWR | O_NOCTTY, 0); 218 return open (ttydev, O_RDWR | O_NOCTTY, 0);
… …
224static int 225static int
225control_tty (int fd_tty) 226control_tty (int fd_tty)
226{ 227{
227 int fd; 228 int fd;
228 229
229 /* ---------------------------------------- */
230 setsid (); 230 setsid ();
231 231
232 /* ---------------------------------------- */
233# if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 232#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
234 /* 233 /*
235 * Push STREAMS modules: 234 * Push STREAMS modules:
236 * ptem: pseudo-terminal hardware emulation module. 235 * ptem: pseudo-terminal hardware emulation module.
237 * ldterm: standard terminal line discipline. 236 * ldterm: standard terminal line discipline.
238 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 237 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
246 * documentation is really unclear about whether it is any close () on 245 * documentation is really unclear about whether it is any close () on
247 * the master side or the last close () - i.e. a proper STREAMS dismantling 246 * the master side or the last close () - i.e. a proper STREAMS dismantling
248 * close () - on the master side which causes a hang up to be sent 247 * close () - on the master side which causes a hang up to be sent
249 * through - Geoff Wing 248 * through - Geoff Wing
250 */ 249 */
251# ifdef HAVE_ISASTREAM 250# ifdef HAVE_ISASTREAM
252 if (isastream (fd_tty) == 1) 251 if (isastream (fd_tty) == 1)
253# endif 252# endif
254 { 253 {
255 ioctl (fd_tty, I_PUSH, "ptem"); 254 ioctl (fd_tty, I_PUSH, "ptem");
256 ioctl (fd_tty, I_PUSH, "ldterm"); 255 ioctl (fd_tty, I_PUSH, "ldterm");
257 ioctl (fd_tty, I_PUSH, "ttcompat"); 256 ioctl (fd_tty, I_PUSH, "ttcompat");
258 } 257 }
259# endif 258#endif
260 /* ---------------------------------------- */ 259
260#ifdef TIOCSCTTY
261 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 261 ioctl (fd_tty, TIOCSCTTY, NULL);
262 /* ---------------------------------------- */ 262#else
263 fd = open (ttyname (fd_tty), O_RDWR);
264 if (fd >= 0)
265 close (fd);
266#endif
267
263 fd = open ("/dev/tty", O_WRONLY); 268 fd = open ("/dev/tty", O_WRONLY);
264 if (fd < 0) 269 if (fd < 0)
265 return -1; /* fatal */ 270 return -1; /* fatal */
271
266 close (fd); 272 close (fd);
267 /* ---------------------------------------- */
268 273
269 return 0; 274 return 0;
270} 275}
271 276
272void 277void
273rxvt_ptytty::close_tty () 278ptytty::close_tty ()
274{ 279{
275 if (tty < 0) 280 if (tty < 0)
276 return; 281 return;
277 282
278 close (tty); 283 close (tty);
279 tty = -1; 284 tty = -1;
280} 285}
281 286
282bool 287bool
283rxvt_ptytty::make_controlling_tty () 288ptytty::make_controlling_tty ()
284{ 289{
285 return control_tty (tty) >= 0; 290 return control_tty (tty) >= 0;
286} 291}
287 292
288void 293void
289rxvt_ptytty::set_utf8_mode (bool on) 294ptytty::set_utf8_mode (bool on)
290{ 295{
291#ifdef IUTF8 296#ifdef IUTF8
292 if (pty < 0) 297 if (pty < 0)
293 return; 298 return;
294 299
… …
310 } 315 }
311 } 316 }
312#endif 317#endif
313} 318}
314 319
315/////////////////////////////////////////////////////////////////////////////
316
317#ifndef NO_SETOWNER_TTYDEV
318static struct ttyconf { 320static struct ttyconf {
319 gid_t gid; 321 gid_t gid;
320 mode_t mode; 322 mode_t mode;
321 323
322 ttyconf () 324 ttyconf ()
… …
331 } 333 }
332 else 334 else
333#endif /* TTY_GID_SUPPORT */ 335#endif /* TTY_GID_SUPPORT */
334 { 336 {
335 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 337 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
336 gid = getgid (); 338 gid = 0;
337 } 339 }
338 } 340 }
339} ttyconf; 341} ttyconf;
340 342
341///////////////////////////////////////////////////////////////////////////// 343ptytty_unix::ptytty_unix ()
344{
345 name = 0;
346#if UTMP_SUPPORT
347 cmd_pid = 0;
348#endif
349}
350
351ptytty_unix::~ptytty_unix ()
352{
353#if UTMP_SUPPORT
354 logout ();
355#endif
356 put ();
357}
342 358
343void 359void
344rxvt_ptytty_unix::privileges (rxvt_privaction action) 360ptytty_unix::put ()
345{ 361{
346 if (!name || !*name) 362 if (name)
347 return;
348
349 rxvt_privileges (RESTORE);
350
351 if (action == SAVE)
352 { 363 {
353# ifndef RESET_TTY_TO_COMMON_DEFAULTS 364 chmod (name, RESTORE_TTY_MODE);
354 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
355 if (lstat (name, &savestat) < 0) /* you lose out */
356 ;
357 else
358# endif
359 {
360 saved = true;
361 chown (name, getuid (), ttyconf.gid); /* fail silently */
362 chmod (name, ttyconf.mode);
363# ifdef HAVE_REVOKE
364 revoke (name);
365# endif
366 }
367 }
368 else
369 { /* action == RESTORE */
370# ifndef RESET_TTY_TO_COMMON_DEFAULTS
371 if (saved)
372 {
373 chmod (name, savestat.st_mode);
374 chown (name, savestat.st_uid, savestat.st_gid);
375 }
376# else
377 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
378 chown (name, 0, 0); 365 chown (name, 0, ttyconf.gid);
379# endif
380
381 } 366 }
382 367
383 rxvt_privileges (IGNORE); 368 close_tty ();
384}
385#endif
386 369
387rxvt_ptytty_unix::rxvt_ptytty_unix () 370 if (pty >= 0)
388{ 371 close (pty);
372
373 free (name);
374
389 pty = tty = -1; 375 pty = tty = -1;
390 name = 0; 376 name = 0;
391#ifndef NO_SETOWNER_TTYDEV
392 saved = false;
393#endif
394#if UTMP_SUPPORT
395 cmd_pid = 0;
396#endif
397}
398
399rxvt_ptytty_unix::~rxvt_ptytty_unix ()
400{
401 logout ();
402 put ();
403}
404
405void
406rxvt_ptytty_unix::put ()
407{
408#ifndef NO_SETOWNER_TTYDEV
409 privileges (RESTORE);
410#endif
411
412 if (pty >= 0) close (pty);
413 close_tty ();
414 free (name);
415
416 pty = tty = -1;
417 name = 0;
418} 377}
419 378
420bool 379bool
421rxvt_ptytty_unix::get () 380ptytty_unix::get ()
422{ 381{
423 /* get master (pty) */ 382 /* get master (pty) */
424 if ((pty = get_pty (&tty, &name)) < 0) 383 if ((pty = get_pty (&tty, &name)) < 0)
425 return false; 384 return false;
426 385
… …
428 387
429 /* get slave (tty) */ 388 /* get slave (tty) */
430 if (tty < 0) 389 if (tty < 0)
431 { 390 {
432#ifndef NO_SETOWNER_TTYDEV 391#ifndef NO_SETOWNER_TTYDEV
433 privileges (SAVE); 392 chown (name, getuid (), ttyconf.gid); /* fail silently */
393 chmod (name, ttyconf.mode);
394# ifdef HAVE_REVOKE
395 revoke (name);
396# endif
434#endif 397#endif
435 398
436 if ((tty = get_tty (name)) < 0) 399 if ((tty = get_tty (name)) < 0)
437 { 400 {
438 put (); 401 put ();
… …
441 } 404 }
442 405
443 return true; 406 return true;
444} 407}
445 408
446#if PTYTTY_HELPER
447
448static int sock_fd;
449static int pid;
450
451struct command
452{
453 enum { get, login, destroy } type;
454
455 rxvt_ptytty *id;
456
457 bool login_shell;
458 int cmd_pid;
459 char hostname[512]; // arbitrary, but should be plenty
460};
461
462struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
463{
464 rxvt_ptytty *id;
465
466 rxvt_ptytty_proxy ();
467 ~rxvt_ptytty_proxy ();
468
469 bool get ();
470 void login (int cmd_pid, bool login_shell, const char *hostname);
471};
472
473bool
474rxvt_ptytty_proxy::get ()
475{
476 command cmd;
477
478 cmd.type = command::get;
479
480 write (sock_fd, &cmd, sizeof (cmd));
481
482 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
483 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n");
484
485 if (!id)
486 return false;
487
488 if ((pty = rxvt_recv_fd (sock_fd)) < 0
489 || (tty = rxvt_recv_fd (sock_fd)) < 0)
490 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
491
492 return true;
493}
494
495void
496rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
497{
498 command cmd;
499
500 cmd.type = command::login;
501 cmd.id = id;
502 cmd.cmd_pid = cmd_pid;
503 cmd.login_shell = login_shell;
504 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
505
506 write (sock_fd, &cmd, sizeof (cmd));
507}
508
509rxvt_ptytty_proxy::~rxvt_ptytty_proxy ()
510{
511 command cmd;
512
513 cmd.type = command::destroy;
514 cmd.id = id;
515
516 write (sock_fd, &cmd, sizeof (cmd));
517}
518
519static
520void serve ()
521{
522 command cmd;
523 vector<rxvt_ptytty *> ptys;
524
525 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
526 {
527 if (cmd.type == command::get)
528 {
529 // -> id ptyfd ttyfd
530 cmd.id = new rxvt_ptytty_unix;
531
532 if (cmd.id->get ())
533 {
534 write (sock_fd, &cmd.id, sizeof (cmd.id));
535 ptys.push_back (cmd.id);
536
537 rxvt_send_fd (sock_fd, cmd.id->pty);
538 rxvt_send_fd (sock_fd, cmd.id->tty);
539 }
540 else
541 {
542 delete cmd.id;
543 cmd.id = 0;
544 write (sock_fd, &cmd.id, sizeof (cmd.id));
545 }
546 }
547 else if (cmd.type == command::login)
548 {
549 if (find (ptys.begin (), ptys.end (), cmd.id))
550 {
551 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
552 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
553 }
554 else printf ("xxx hiya login no match %p\n", cmd.id);
555 }
556 else if (cmd.type == command::destroy)
557 {
558 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
559
560 if (*pty)
561 {
562 ptys.erase (pty);
563 delete *pty;
564 }
565 else printf ("xxx hiya destroy no match %p\n", cmd.id);
566 }
567 else
568 break;
569 }
570
571 // destroy all ptys
572 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); )
573 delete *i;
574}
575
576void rxvt_ptytty_server ()
577{
578 int sv[2];
579
580 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
581 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
582
583 pid = fork ();
584
585 if (pid < 0)
586 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n");
587
588 if (pid)
589 {
590 // client, urxvt
591 sock_fd = sv[0];
592 close (sv[1]);
593 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
594 }
595 else
596 {
597 // server, pty-helper
598 sock_fd = sv[1];
599
600 close (sv[0]);//D
601// for (int fd = 0; fd < 1023; fd++)
602// if (fd != sock_fd)
603// close (fd);
604
605 serve ();
606 _exit (EXIT_SUCCESS);
607 }
608}
609#endif
610
611// a "factory" *g*
612rxvt_ptytty *
613rxvt_new_ptytty ()
614{
615#if PTYTTY_HELPER
616 if (pid > 0)
617 {
618 // use helper process
619 return new rxvt_ptytty_proxy;
620 }
621 else
622#endif
623 return new rxvt_ptytty_unix;
624}
625
626/*----------------------- end-of-file (C source) -----------------------*/
627

Diff Legend

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