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.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
77 rxvt_privileges(RESTORE); 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
78 int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 104 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
79 rxvt_privileges(IGNORE);
80
81 if (res != -1) 105 if (res != -1)
82 { 106 {
83 *ttydev = strdup (tty_name); 107 *ttydev = strdup (tty_name);
84 return pfd; 108 return pfd;
85 } 109 }
86#endif
87 110
88#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
89 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 119 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
90 if (*ttydev != NULL) 120 if (*ttydev != NULL)
91 return pfd; 121 return pfd;
92#endif
93 122
94#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 123 return -1;
95# 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;
96 130
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) 131 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
124 { 132 {
125 *ttydev = strdup (ttyname (pfd)); 133 *ttydev = strdup (ttyname (pfd));
126 return pfd; 134 return pfd;
127 } 135 }
128#endif
129 136
130#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
131 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)
132 { 146 {
133 *ttydev = strdup (ptsname (pfd)); 147 *ttydev = strdup (ptsname (pfd));
134 return pfd; 148 return pfd;
135 } 149 }
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 150
207 return -1; 151 return -1;
208} 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
209 185
210/*----------------------------------------------------------------------*/ 186/*----------------------------------------------------------------------*/
211/* 187/*
212 * Returns tty file descriptor, or -1 on failure 188 * Returns tty file descriptor, or -1 on failure
213 */ 189 */
… …
222 * 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
223 */ 199 */
224static int 200static int
225control_tty (int fd_tty) 201control_tty (int fd_tty)
226{ 202{
227 int fd;
228
229 /* ---------------------------------------- */
230 setsid (); 203 setsid ();
231 204
232 /* ---------------------------------------- */
233# if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 205#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
234 /* 206 /*
235 * Push STREAMS modules: 207 * Push STREAMS modules:
236 * ptem: pseudo-terminal hardware emulation module. 208 * ptem: pseudo-terminal hardware emulation module.
237 * ldterm: standard terminal line discipline. 209 * ldterm: standard terminal line discipline.
238 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 210 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
246 * documentation is really unclear about whether it is any close () on 218 * 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 219 * 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 220 * close () - on the master side which causes a hang up to be sent
249 * through - Geoff Wing 221 * through - Geoff Wing
250 */ 222 */
251# ifdef HAVE_ISASTREAM 223# ifdef HAVE_ISASTREAM
252 if (isastream (fd_tty) == 1) 224 if (isastream (fd_tty) == 1)
253# endif 225# endif
254 { 226 {
255 ioctl (fd_tty, I_PUSH, "ptem"); 227 ioctl (fd_tty, I_PUSH, "ptem");
256 ioctl (fd_tty, I_PUSH, "ldterm"); 228 ioctl (fd_tty, I_PUSH, "ldterm");
257 ioctl (fd_tty, I_PUSH, "ttcompat"); 229 ioctl (fd_tty, I_PUSH, "ttcompat");
258 } 230 }
259# endif 231#endif
260 /* ---------------------------------------- */ 232
261 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 233 ioctl (fd_tty, TIOCSCTTY, NULL);
262 /* ---------------------------------------- */ 234
263 fd = open ("/dev/tty", O_WRONLY); 235 int fd = open ("/dev/tty", O_WRONLY);
264 if (fd < 0) 236 if (fd < 0)
265 return -1; /* fatal */ 237 return -1; /* fatal */
238
266 close (fd); 239 close (fd);
267 /* ---------------------------------------- */
268 240
269 return 0; 241 return 0;
270} 242}
271 243
272void 244void
273rxvt_ptytty::close_tty () 245ptytty::close_tty ()
274{ 246{
275 if (tty < 0) 247 if (tty < 0)
276 return; 248 return;
277 249
278 close (tty); 250 close (tty);
279 tty = -1; 251 tty = -1;
280} 252}
281 253
282bool 254bool
283rxvt_ptytty::make_controlling_tty () 255ptytty::make_controlling_tty ()
284{ 256{
285 return control_tty (tty) >= 0; 257 return control_tty (tty) >= 0;
286} 258}
287 259
288void 260void
289rxvt_ptytty::set_utf8_mode (bool on) 261ptytty::set_utf8_mode (bool on)
290{ 262{
291#ifdef IUTF8 263#ifdef IUTF8
292 if (pty < 0) 264 if (pty < 0)
293 return; 265 return;
294 266
… …
310 } 282 }
311 } 283 }
312#endif 284#endif
313} 285}
314 286
315/////////////////////////////////////////////////////////////////////////////
316
317#ifndef NO_SETOWNER_TTYDEV
318static struct ttyconf { 287static struct ttyconf {
319 gid_t gid; 288 gid_t gid;
320 mode_t mode; 289 mode_t mode;
321 290
322 ttyconf () 291 ttyconf ()
… …
331 } 300 }
332 else 301 else
333#endif /* TTY_GID_SUPPORT */ 302#endif /* TTY_GID_SUPPORT */
334 { 303 {
335 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 304 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
336 gid = getgid (); 305 gid = 0;
337 } 306 }
338 } 307 }
339} ttyconf; 308} ttyconf;
340 309
341///////////////////////////////////////////////////////////////////////////// 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}
342 325
343void 326void
344rxvt_ptytty_unix::privileges (rxvt_privaction action) 327ptytty_unix::put ()
345{ 328{
346 if (!name || !*name) 329 chmod (name, RESTORE_TTY_MODE);
347 return; 330 chown (name, 0, ttyconf.gid);
348 331
349 rxvt_privileges (RESTORE); 332 close_tty ();
350 333
351 if (action == SAVE) 334 if (pty >= 0)
352 { 335 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 336
381 } 337 free (name);
382 338
383 rxvt_privileges (IGNORE);
384}
385#endif
386
387rxvt_ptytty_unix::rxvt_ptytty_unix ()
388{
389 pty = tty = -1; 339 pty = tty = -1;
390 name = 0; 340 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} 341}
419 342
420bool 343bool
421rxvt_ptytty_unix::get () 344ptytty_unix::get ()
422{ 345{
423 /* get master (pty) */ 346 /* get master (pty) */
424 if ((pty = get_pty (&tty, &name)) < 0) 347 if ((pty = get_pty (&tty, &name)) < 0)
425 return false; 348 return false;
426 349
… …
428 351
429 /* get slave (tty) */ 352 /* get slave (tty) */
430 if (tty < 0) 353 if (tty < 0)
431 { 354 {
432#ifndef NO_SETOWNER_TTYDEV 355#ifndef NO_SETOWNER_TTYDEV
433 privileges (SAVE); 356 chown (name, getuid (), ttyconf.gid); /* fail silently */
357 chmod (name, ttyconf.mode);
358# ifdef HAVE_REVOKE
359 revoke (name);
360# endif
434#endif 361#endif
435 362
436 if ((tty = get_tty (name)) < 0) 363 if ((tty = get_tty (name)) < 0)
437 { 364 {
438 put (); 365 put ();
… …
450 377
451struct command 378struct command
452{ 379{
453 enum { get, login, destroy } type; 380 enum { get, login, destroy } type;
454 381
455 rxvt_ptytty *id; 382 ptytty *id;
456 383
457 bool login_shell; 384 bool login_shell;
458 int cmd_pid; 385 int cmd_pid;
459 char hostname[512]; // arbitrary, but should be plenty 386 char hostname[512]; // arbitrary, but should be plenty
460}; 387};
461 388
462struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 389struct ptytty_proxy : ptytty
463{ 390{
464 rxvt_ptytty *id; 391 ptytty *id;
465 392
466 rxvt_ptytty_proxy (); 393 ptytty_proxy ()
394 : id(0)
395 {
396 }
397
467 ~rxvt_ptytty_proxy (); 398 ~ptytty_proxy ();
468 399
469 bool get (); 400 bool get ();
470 void login (int cmd_pid, bool login_shell, const char *hostname); 401 void login (int cmd_pid, bool login_shell, const char *hostname);
471}; 402};
472 403
473bool 404bool
474rxvt_ptytty_proxy::get () 405ptytty_proxy::get ()
475{ 406{
476 command cmd; 407 command cmd;
477 408
478 cmd.type = command::get; 409 cmd.type = command::get;
479 410
480 write (sock_fd, &cmd, sizeof (cmd)); 411 write (sock_fd, &cmd, sizeof (cmd));
481 412
482 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 413 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
483 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); 414 fatal ("protocol error while creating pty using helper process, aborting.\n");
484 415
485 if (!id) 416 if (!id)
486 return false; 417 return false;
487 418
488 if ((pty = rxvt_recv_fd (sock_fd)) < 0 419 if ((pty = ptytty_recv_fd (sock_fd)) < 0
489 || (tty = rxvt_recv_fd (sock_fd)) < 0) 420 || (tty = ptytty_recv_fd (sock_fd)) < 0)
490 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");
491 422
492 return true; 423 return true;
493} 424}
494 425
495void 426void
496rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 427ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
497{ 428{
498 command cmd; 429 command cmd;
499 430
500 cmd.type = command::login; 431 cmd.type = command::login;
501 cmd.id = id; 432 cmd.id = id;
… …
504 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 435 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
505 436
506 write (sock_fd, &cmd, sizeof (cmd)); 437 write (sock_fd, &cmd, sizeof (cmd));
507} 438}
508 439
509rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 440ptytty_proxy::~ptytty_proxy ()
510{ 441{
442 if (id)
443 {
511 command cmd; 444 command cmd;
512 445
513 cmd.type = command::destroy; 446 cmd.type = command::destroy;
514 cmd.id = id; 447 cmd.id = id;
515 448
516 write (sock_fd, &cmd, sizeof (cmd)); 449 write (sock_fd, &cmd, sizeof (cmd));
450 }
517} 451}
518 452
519static 453static
520void serve () 454void serve ()
521{ 455{
522 command cmd; 456 command cmd;
523 vector<rxvt_ptytty *> ptys; 457 vector<ptytty *> ptys;
524 458
525 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 459 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
526 { 460 {
527 if (cmd.type == command::get) 461 if (cmd.type == command::get)
528 { 462 {
529 // -> id ptyfd ttyfd 463 // -> id ptyfd ttyfd
530 cmd.id = new rxvt_ptytty_unix; 464 cmd.id = new ptytty_unix;
531 465
532 if (cmd.id->get ()) 466 if (cmd.id->get ())
533 { 467 {
534 write (sock_fd, &cmd.id, sizeof (cmd.id)); 468 write (sock_fd, &cmd.id, sizeof (cmd.id));
535 ptys.push_back (cmd.id); 469 ptys.push_back (cmd.id);
536 470
537 rxvt_send_fd (sock_fd, cmd.id->pty); 471 ptytty_send_fd (sock_fd, cmd.id->pty);
538 rxvt_send_fd (sock_fd, cmd.id->tty); 472 ptytty_send_fd (sock_fd, cmd.id->tty);
539 } 473 }
540 else 474 else
541 { 475 {
542 delete cmd.id; 476 delete cmd.id;
543 cmd.id = 0; 477 cmd.id = 0;
544 write (sock_fd, &cmd.id, sizeof (cmd.id)); 478 write (sock_fd, &cmd.id, sizeof (cmd.id));
545 } 479 }
546 } 480 }
547 else if (cmd.type == command::login) 481 else if (cmd.type == command::login)
548 { 482 {
483#if UTMP_SUPPORT
549 if (find (ptys.begin (), ptys.end (), cmd.id)) 484 if (find (ptys.begin (), ptys.end (), cmd.id))
550 { 485 {
551 cmd.hostname[sizeof (cmd.hostname) - 1] = 0; 486 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
552 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); 487 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
553 } 488 }
554 else printf ("xxx hiya login no match %p\n", cmd.id); 489#endif
555 } 490 }
556 else if (cmd.type == command::destroy) 491 else if (cmd.type == command::destroy)
557 { 492 {
558 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 493 ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
559 494
560 if (*pty) 495 if (pty)
561 { 496 {
497 delete *pty;
562 ptys.erase (pty); 498 ptys.erase (pty);
563 delete *pty;
564 } 499 }
565 else printf ("xxx hiya destroy no match %p\n", cmd.id);
566 } 500 }
567 else 501 else
568 break; 502 break;
569 } 503 }
570 504
571 // destroy all ptys 505 // destroy all ptys
572 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 506 for (ptytty **i = ptys.end (); i-- > ptys.begin (); )
573 delete *i; 507 delete *i;
574} 508}
575 509
576void rxvt_ptytty_server () 510void ptytty_server ()
577{ 511{
578 int sv[2]; 512 int sv[2];
579 513
580 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 514 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
581 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");
582 516
583 pid = fork (); 517 pid = fork ();
584 518
585 if (pid < 0) 519 if (pid < 0)
586 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 520 fatal ("could not create pty/sessiondb helper process, aborting.\n");
587 521
588 if (pid) 522 if (pid)
589 { 523 {
590 // client, urxvt 524 // client, process
591 sock_fd = sv[0]; 525 sock_fd = sv[0];
592 close (sv[1]); 526 close (sv[1]);
593 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 527 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
594 } 528 }
595 else 529 else
596 { 530 {
597 // server, pty-helper 531 // server, pty-helper
598 sock_fd = sv[1]; 532 sock_fd = sv[1];
599 533
600 close (sv[0]);//D
601// for (int fd = 0; fd < 1023; fd++) 534 for (int fd = 0; fd < 1023; fd++)
602// if (fd != sock_fd) 535 if (fd != sock_fd)
603// close (fd); 536 close (fd);
604 537
605 serve (); 538 serve ();
606 _exit (EXIT_SUCCESS); 539 _exit (EXIT_SUCCESS);
607 } 540 }
608} 541}
542
609#endif 543#endif
610 544
611// a "factory" *g* 545// a "factory" *g*
612rxvt_ptytty * 546ptytty *
613rxvt_new_ptytty () 547new_ptytty ()
614{ 548{
615#if PTYTTY_HELPER 549#if PTYTTY_HELPER
616 if (pid > 0) 550 if (pid > 0)
617 {
618 // use helper process 551 // use helper process
619 return new rxvt_ptytty_proxy; 552 return new ptytty_proxy;
620 }
621 else 553 else
622#endif 554#endif
623 return new rxvt_ptytty_unix; 555 return new ptytty_unix;
624} 556}
625 557
626/*----------------------- end-of-file (C source) -----------------------*/ 558/*----------------------- end-of-file (C source) -----------------------*/
627 559

Diff Legend

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