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.39 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.52 by root, Thu Jan 19 20:30:36 2006 UTC

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

Diff Legend

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