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

Diff Legend

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