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

Diff Legend

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