… | |
… | |
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 | static int |
69 | static inline int |
70 | get_pty (int *fd_tty, char **ttydev) |
70 | get_pty_streams (int *fd_tty, char **ttydev) |
71 | { |
71 | { |
|
|
72 | #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) |
|
|
73 | # if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX) |
72 | int pfd; |
74 | int pfd; |
73 | |
75 | |
|
|
76 | # if defined(PTYS_ARE_GETPT) |
|
|
77 | pfd = getpt(); |
|
|
78 | # elif defined(PTYS_ARE_POSIX) |
|
|
79 | pfd = posix_openpt (O_RDWR); |
|
|
80 | # else |
|
|
81 | pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); |
|
|
82 | # endif |
|
|
83 | if (pfd >= 0) |
|
|
84 | { |
|
|
85 | if (grantpt (pfd) == 0 /* change slave permissions */ |
|
|
86 | && unlockpt (pfd) == 0) |
|
|
87 | { /* slave now unlocked */ |
|
|
88 | *ttydev = strdup (ptsname (pfd)); /* get slave's name */ |
|
|
89 | return pfd; |
|
|
90 | } |
|
|
91 | |
|
|
92 | close (pfd); |
|
|
93 | } |
|
|
94 | # endif |
|
|
95 | #endif |
|
|
96 | |
|
|
97 | return -1; |
|
|
98 | } |
|
|
99 | |
|
|
100 | static inline int |
|
|
101 | get_pty_openpty (int *fd_tty, char **ttydev) |
|
|
102 | { |
74 | #ifdef PTYS_ARE_OPENPTY |
103 | #ifdef PTYS_ARE_OPENPTY |
|
|
104 | int pfd; |
|
|
105 | int res; |
75 | char tty_name[sizeof "/dev/pts/????\0"]; |
106 | char tty_name[sizeof "/dev/pts/????\0"]; |
76 | |
107 | |
77 | rxvt_privileges(RESTORE); |
|
|
78 | int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); |
108 | res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); |
79 | rxvt_privileges(IGNORE); |
|
|
80 | |
|
|
81 | if (res != -1) |
109 | if (res != -1) |
82 | { |
110 | { |
83 | *ttydev = strdup (tty_name); |
111 | *ttydev = strdup (tty_name); |
84 | return pfd; |
112 | return pfd; |
85 | } |
113 | } |
86 | #endif |
114 | #endif |
87 | |
115 | |
|
|
116 | return -1; |
|
|
117 | } |
|
|
118 | |
|
|
119 | static inline int |
|
|
120 | get_pty__getpty (int *fd_tty, char **ttydev) |
|
|
121 | { |
88 | #ifdef PTYS_ARE__GETPTY |
122 | #ifdef PTYS_ARE__GETPTY |
|
|
123 | int pfd; |
|
|
124 | |
89 | *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); |
125 | *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); |
90 | if (*ttydev != NULL) |
126 | if (*ttydev != NULL) |
91 | return pfd; |
127 | return pfd; |
92 | #endif |
128 | #endif |
93 | |
129 | |
94 | #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) |
130 | return -1; |
95 | # if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX) |
131 | } |
96 | |
132 | |
97 | { |
133 | static inline int |
98 | # ifdef PTYS_ARE_GETPT |
134 | get_pty_ptc (int *fd_tty, char **ttydev) |
99 | pfd = getpt(); |
135 | { |
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 |
136 | #ifdef PTYS_ARE_PTC |
|
|
137 | int pfd; |
|
|
138 | |
123 | if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) |
139 | if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) |
124 | { |
140 | { |
125 | *ttydev = strdup (ttyname (pfd)); |
141 | *ttydev = strdup (ttyname (pfd)); |
126 | return pfd; |
142 | return pfd; |
127 | } |
143 | } |
128 | #endif |
144 | #endif |
129 | |
145 | |
|
|
146 | return -1; |
|
|
147 | } |
|
|
148 | |
|
|
149 | static inline int |
|
|
150 | get_pty_clone (int *fd_tty, char **ttydev) |
|
|
151 | { |
130 | #ifdef PTYS_ARE_CLONE |
152 | #ifdef PTYS_ARE_CLONE |
|
|
153 | int pfd; |
|
|
154 | |
131 | if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) |
155 | if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) |
132 | { |
156 | { |
133 | *ttydev = strdup (ptsname (pfd)); |
157 | *ttydev = strdup (ptsname (pfd)); |
134 | return pfd; |
158 | return pfd; |
135 | } |
159 | } |
136 | #endif |
160 | #endif |
137 | |
161 | |
|
|
162 | return -1; |
|
|
163 | } |
|
|
164 | |
|
|
165 | static inline int |
|
|
166 | get_pty_numeric (int *fd_tty, char **ttydev) |
|
|
167 | { |
138 | #ifdef PTYS_ARE_NUMERIC |
168 | #ifdef PTYS_ARE_NUMERIC |
139 | { |
169 | int pfd; |
140 | int idx; |
170 | int idx; |
141 | char *c1, *c2; |
171 | char *c1, *c2; |
142 | char pty_name[] = "/dev/ptyp???"; |
172 | char pty_name[] = "/dev/ptyp???"; |
143 | char tty_name[] = "/dev/ttyp???"; |
173 | char tty_name[] = "/dev/ttyp???"; |
144 | |
174 | |
145 | c1 = &(pty_name[sizeof (pty_name) - 4]); |
175 | c1 = &(pty_name[sizeof (pty_name) - 4]); |
146 | c2 = &(tty_name[sizeof (tty_name) - 4]); |
176 | c2 = &(tty_name[sizeof (tty_name) - 4]); |
|
|
177 | |
147 | for (idx = 0; idx < 256; idx++) |
178 | for (idx = 0; idx < 256; idx++) |
148 | { |
179 | { |
149 | sprintf (c1, "%d", idx); |
180 | sprintf (c1, "%d", idx); |
150 | sprintf (c2, "%d", idx); |
181 | sprintf (c2, "%d", idx); |
|
|
182 | |
151 | if (access (tty_name, F_OK) < 0) |
183 | if (access (tty_name, F_OK) < 0) |
152 | { |
184 | { |
153 | idx = 256; |
185 | idx = 256; |
154 | break; |
186 | break; |
155 | } |
187 | } |
156 | |
188 | |
157 | if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) |
189 | if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) |
158 | { |
190 | { |
159 | if (access (tty_name, R_OK | W_OK) == 0) |
191 | if (access (tty_name, R_OK | W_OK) == 0) |
160 | { |
192 | { |
161 | *ttydev = strdup (tty_name); |
193 | *ttydev = strdup (tty_name); |
162 | return pfd; |
194 | return pfd; |
163 | } |
195 | } |
164 | |
196 | |
165 | close (pfd); |
197 | close (pfd); |
166 | } |
198 | } |
167 | } |
199 | } |
168 | } |
|
|
169 | #endif |
200 | #endif |
170 | |
201 | |
|
|
202 | return -1; |
|
|
203 | } |
|
|
204 | |
|
|
205 | static inline int |
|
|
206 | get_pty_searched (int *fd_tty, char **ttydev) |
|
|
207 | { |
171 | #ifdef PTYS_ARE_SEARCHED |
208 | #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 |
209 | # ifndef PTYCHAR1 |
178 | # define PTYCHAR1 "pqrstuvwxyz" |
210 | # define PTYCHAR1 "pqrstuvwxyz" |
179 | # endif |
211 | # endif |
180 | # ifndef PTYCHAR2 |
212 | # ifndef PTYCHAR2 |
181 | # define PTYCHAR2 "0123456789abcdef" |
213 | # define PTYCHAR2 "0123456789abcdef" |
182 | # endif |
214 | # endif |
|
|
215 | int pfd; |
|
|
216 | const char *c1, *c2; |
|
|
217 | char pty_name[] = "/dev/pty??"; |
|
|
218 | char tty_name[] = "/dev/tty??"; |
183 | |
219 | |
184 | for (c1 = PTYCHAR1; *c1; c1++) |
220 | for (c1 = PTYCHAR1; *c1; c1++) |
185 | { |
221 | { |
186 | pty_name[ (sizeof (pty_name) - 3)] = |
222 | pty_name[ (sizeof (pty_name) - 3)] = |
187 | tty_name[ (sizeof (pty_name) - 3)] = *c1; |
223 | tty_name[ (sizeof (pty_name) - 3)] = *c1; |
|
|
224 | |
188 | for (c2 = PTYCHAR2; *c2; c2++) |
225 | for (c2 = PTYCHAR2; *c2; c2++) |
189 | { |
226 | { |
190 | pty_name[ (sizeof (pty_name) - 2)] = |
227 | pty_name[ (sizeof (pty_name) - 2)] = |
191 | tty_name[ (sizeof (pty_name) - 2)] = *c2; |
228 | tty_name[ (sizeof (pty_name) - 2)] = *c2; |
|
|
229 | |
192 | if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) |
230 | if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) |
193 | { |
231 | { |
194 | if (access (tty_name, R_OK | W_OK) == 0) |
232 | if (access (tty_name, R_OK | W_OK) == 0) |
195 | { |
233 | { |
196 | *ttydev = strdup (tty_name); |
234 | *ttydev = strdup (tty_name); |
197 | return pfd; |
235 | return pfd; |
198 | } |
236 | } |
199 | |
237 | |
200 | close (pfd); |
238 | close (pfd); |
201 | } |
239 | } |
202 | } |
240 | } |
203 | } |
241 | } |
204 | } |
|
|
205 | #endif |
242 | #endif |
|
|
243 | |
|
|
244 | return -1; |
|
|
245 | } |
|
|
246 | |
|
|
247 | static int |
|
|
248 | get_pty (int *fd_tty, char **ttydev) |
|
|
249 | { |
|
|
250 | int pfd; |
|
|
251 | |
|
|
252 | if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1 |
|
|
253 | || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1 |
|
|
254 | || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1 |
|
|
255 | || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1 |
|
|
256 | || (pfd = get_pty_clone (fd_tty, ttydev)) != -1 |
|
|
257 | || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1 |
|
|
258 | || (pfd = get_pty_searched (fd_tty, ttydev)) != -1) |
|
|
259 | return pfd; |
206 | |
260 | |
207 | return -1; |
261 | return -1; |
208 | } |
262 | } |
209 | |
263 | |
210 | /*----------------------------------------------------------------------*/ |
264 | /*----------------------------------------------------------------------*/ |
… | |
… | |
222 | * Make our tty a controlling tty so that /dev/tty points to us |
276 | * Make our tty a controlling tty so that /dev/tty points to us |
223 | */ |
277 | */ |
224 | static int |
278 | static int |
225 | control_tty (int fd_tty) |
279 | control_tty (int fd_tty) |
226 | { |
280 | { |
227 | int fd; |
|
|
228 | |
|
|
229 | /* ---------------------------------------- */ |
|
|
230 | setsid (); |
281 | setsid (); |
231 | |
282 | |
232 | /* ---------------------------------------- */ |
|
|
233 | # if defined(PTYS_ARE_PTMX) && defined(I_PUSH) |
283 | #if defined(PTYS_ARE_PTMX) && defined(I_PUSH) |
234 | /* |
284 | /* |
235 | * Push STREAMS modules: |
285 | * Push STREAMS modules: |
236 | * ptem: pseudo-terminal hardware emulation module. |
286 | * ptem: pseudo-terminal hardware emulation module. |
237 | * ldterm: standard terminal line discipline. |
287 | * ldterm: standard terminal line discipline. |
238 | * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. |
288 | * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. |
… | |
… | |
246 | * documentation is really unclear about whether it is any close () on |
296 | * 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 |
297 | * 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 |
298 | * close () - on the master side which causes a hang up to be sent |
249 | * through - Geoff Wing |
299 | * through - Geoff Wing |
250 | */ |
300 | */ |
251 | # ifdef HAVE_ISASTREAM |
301 | # ifdef HAVE_ISASTREAM |
252 | if (isastream (fd_tty) == 1) |
302 | if (isastream (fd_tty) == 1) |
253 | # endif |
303 | # endif |
254 | { |
304 | { |
255 | ioctl (fd_tty, I_PUSH, "ptem"); |
305 | ioctl (fd_tty, I_PUSH, "ptem"); |
256 | ioctl (fd_tty, I_PUSH, "ldterm"); |
306 | ioctl (fd_tty, I_PUSH, "ldterm"); |
257 | ioctl (fd_tty, I_PUSH, "ttcompat"); |
307 | ioctl (fd_tty, I_PUSH, "ttcompat"); |
258 | } |
308 | } |
259 | # endif |
309 | #endif |
260 | /* ---------------------------------------- */ |
310 | |
261 | fd = ioctl (fd_tty, TIOCSCTTY, NULL); |
311 | ioctl (fd_tty, TIOCSCTTY, NULL); |
262 | /* ---------------------------------------- */ |
312 | |
263 | fd = open ("/dev/tty", O_WRONLY); |
313 | int fd = open ("/dev/tty", O_WRONLY); |
264 | if (fd < 0) |
314 | if (fd < 0) |
265 | return -1; /* fatal */ |
315 | return -1; /* fatal */ |
|
|
316 | |
266 | close (fd); |
317 | close (fd); |
267 | /* ---------------------------------------- */ |
|
|
268 | |
318 | |
269 | return 0; |
319 | return 0; |
270 | } |
320 | } |
271 | |
321 | |
272 | void |
322 | void |
… | |
… | |
310 | } |
360 | } |
311 | } |
361 | } |
312 | #endif |
362 | #endif |
313 | } |
363 | } |
314 | |
364 | |
315 | ///////////////////////////////////////////////////////////////////////////// |
|
|
316 | |
|
|
317 | #ifndef NO_SETOWNER_TTYDEV |
|
|
318 | static struct ttyconf { |
365 | static struct ttyconf { |
319 | gid_t gid; |
366 | gid_t gid; |
320 | mode_t mode; |
367 | mode_t mode; |
321 | |
368 | |
322 | ttyconf () |
369 | ttyconf () |
… | |
… | |
331 | } |
378 | } |
332 | else |
379 | else |
333 | #endif /* TTY_GID_SUPPORT */ |
380 | #endif /* TTY_GID_SUPPORT */ |
334 | { |
381 | { |
335 | mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; |
382 | mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; |
336 | gid = getgid (); |
383 | gid = 0; |
337 | } |
384 | } |
338 | } |
385 | } |
339 | } ttyconf; |
386 | } ttyconf; |
340 | |
|
|
341 | ///////////////////////////////////////////////////////////////////////////// |
|
|
342 | |
|
|
343 | void |
|
|
344 | rxvt_ptytty_unix::privileges (rxvt_privaction action) |
|
|
345 | { |
|
|
346 | if (!name || !*name) |
|
|
347 | return; |
|
|
348 | |
|
|
349 | rxvt_privileges (RESTORE); |
|
|
350 | |
|
|
351 | if (action == SAVE) |
|
|
352 | { |
|
|
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 | |
|
|
381 | } |
|
|
382 | |
|
|
383 | rxvt_privileges (IGNORE); |
|
|
384 | } |
|
|
385 | #endif |
|
|
386 | |
387 | |
387 | rxvt_ptytty_unix::rxvt_ptytty_unix () |
388 | rxvt_ptytty_unix::rxvt_ptytty_unix () |
388 | { |
389 | { |
389 | pty = tty = -1; |
390 | pty = tty = -1; |
390 | name = 0; |
391 | name = 0; |
391 | #ifndef NO_SETOWNER_TTYDEV |
|
|
392 | saved = false; |
|
|
393 | #endif |
|
|
394 | #if UTMP_SUPPORT |
392 | #if UTMP_SUPPORT |
395 | cmd_pid = 0; |
393 | cmd_pid = 0; |
396 | #endif |
394 | #endif |
397 | } |
395 | } |
398 | |
396 | |
399 | rxvt_ptytty_unix::~rxvt_ptytty_unix () |
397 | rxvt_ptytty_unix::~rxvt_ptytty_unix () |
400 | { |
398 | { |
|
|
399 | #if UTMP_SUPPORT |
401 | logout (); |
400 | logout (); |
|
|
401 | #endif |
402 | put (); |
402 | put (); |
403 | } |
403 | } |
404 | |
404 | |
405 | void |
405 | void |
406 | rxvt_ptytty_unix::put () |
406 | rxvt_ptytty_unix::put () |
407 | { |
407 | { |
408 | #ifndef NO_SETOWNER_TTYDEV |
408 | chmod (name, RESTORE_TTY_MODE); |
409 | privileges (RESTORE); |
409 | chown (name, 0, ttyconf.gid); |
410 | #endif |
|
|
411 | |
410 | |
412 | if (pty >= 0) close (pty); |
|
|
413 | close_tty (); |
411 | close_tty (); |
|
|
412 | |
|
|
413 | if (pty >= 0) |
|
|
414 | close (pty); |
|
|
415 | |
414 | free (name); |
416 | free (name); |
415 | |
417 | |
416 | pty = tty = -1; |
418 | pty = tty = -1; |
417 | name = 0; |
419 | name = 0; |
418 | } |
420 | } |
… | |
… | |
428 | |
430 | |
429 | /* get slave (tty) */ |
431 | /* get slave (tty) */ |
430 | if (tty < 0) |
432 | if (tty < 0) |
431 | { |
433 | { |
432 | #ifndef NO_SETOWNER_TTYDEV |
434 | #ifndef NO_SETOWNER_TTYDEV |
433 | privileges (SAVE); |
435 | chown (name, getuid (), ttyconf.gid); /* fail silently */ |
|
|
436 | chmod (name, ttyconf.mode); |
|
|
437 | # ifdef HAVE_REVOKE |
|
|
438 | revoke (name); |
|
|
439 | # endif |
434 | #endif |
440 | #endif |
435 | |
441 | |
436 | if ((tty = get_tty (name)) < 0) |
442 | if ((tty = get_tty (name)) < 0) |
437 | { |
443 | { |
438 | put (); |
444 | put (); |
… | |
… | |
461 | |
467 | |
462 | struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty |
468 | struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty |
463 | { |
469 | { |
464 | rxvt_ptytty *id; |
470 | rxvt_ptytty *id; |
465 | |
471 | |
466 | rxvt_ptytty_proxy (); |
|
|
467 | ~rxvt_ptytty_proxy (); |
472 | ~rxvt_ptytty_proxy (); |
468 | |
473 | |
469 | bool get (); |
474 | bool get (); |
470 | void login (int cmd_pid, bool login_shell, const char *hostname); |
475 | void login (int cmd_pid, bool login_shell, const char *hostname); |
471 | }; |
476 | }; |
… | |
… | |
544 | write (sock_fd, &cmd.id, sizeof (cmd.id)); |
549 | write (sock_fd, &cmd.id, sizeof (cmd.id)); |
545 | } |
550 | } |
546 | } |
551 | } |
547 | else if (cmd.type == command::login) |
552 | else if (cmd.type == command::login) |
548 | { |
553 | { |
|
|
554 | #if UTMP_SUPPORT |
549 | if (find (ptys.begin (), ptys.end (), cmd.id)) |
555 | if (find (ptys.begin (), ptys.end (), cmd.id)) |
550 | { |
556 | { |
551 | cmd.hostname[sizeof (cmd.hostname) - 1] = 0; |
557 | cmd.hostname[sizeof (cmd.hostname) - 1] = 0; |
552 | cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); |
558 | cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); |
553 | } |
559 | } |
554 | else printf ("xxx hiya login no match %p\n", cmd.id); |
560 | #endif |
555 | } |
561 | } |
556 | else if (cmd.type == command::destroy) |
562 | else if (cmd.type == command::destroy) |
557 | { |
563 | { |
558 | rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); |
564 | rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); |
559 | |
565 | |
560 | if (*pty) |
566 | if (pty) |
561 | { |
567 | { |
|
|
568 | delete *pty; |
562 | ptys.erase (pty); |
569 | ptys.erase (pty); |
563 | delete *pty; |
|
|
564 | } |
570 | } |
565 | else printf ("xxx hiya destroy no match %p\n", cmd.id); |
|
|
566 | } |
571 | } |
567 | else |
572 | else |
568 | break; |
573 | break; |
569 | } |
574 | } |
570 | |
575 | |
… | |
… | |
595 | else |
600 | else |
596 | { |
601 | { |
597 | // server, pty-helper |
602 | // server, pty-helper |
598 | sock_fd = sv[1]; |
603 | sock_fd = sv[1]; |
599 | |
604 | |
600 | close (sv[0]);//D |
|
|
601 | // for (int fd = 0; fd < 1023; fd++) |
605 | for (int fd = 0; fd < 1023; fd++) |
602 | // if (fd != sock_fd) |
606 | if (fd != sock_fd) |
603 | // close (fd); |
607 | close (fd); |
604 | |
608 | |
605 | serve (); |
609 | serve (); |
606 | _exit (EXIT_SUCCESS); |
610 | _exit (EXIT_SUCCESS); |
607 | } |
611 | } |
608 | } |
612 | } |
|
|
613 | |
609 | #endif |
614 | #endif |
610 | |
615 | |
611 | // a "factory" *g* |
616 | // a "factory" *g* |
612 | rxvt_ptytty * |
617 | rxvt_ptytty * |
613 | rxvt_new_ptytty () |
618 | rxvt_new_ptytty () |
614 | { |
619 | { |
615 | #if PTYTTY_HELPER |
620 | #if PTYTTY_HELPER |
616 | if (pid > 0) |
621 | if (pid > 0) |
617 | { |
|
|
618 | // use helper process |
622 | // use helper process |
619 | return new rxvt_ptytty_proxy; |
623 | return new rxvt_ptytty_proxy; |
620 | } |
|
|
621 | else |
624 | else |
622 | #endif |
625 | #endif |
623 | return new rxvt_ptytty_unix; |
626 | return new rxvt_ptytty_unix; |
624 | } |
627 | } |
625 | |
628 | |