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

Diff Legend

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