--- rxvt-unicode/src/ptytty.C 2003/12/02 21:49:46 1.4 +++ rxvt-unicode/src/ptytty.C 2004/08/13 03:36:57 1.12 @@ -1,10 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: ptytty.c + * File: ptytty.C *----------------------------------------------------------------------* - * $Id: ptytty.C,v 1.4 2003/12/02 21:49:46 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,9 +27,15 @@ * Try to be self-contained except for the above autoconfig'd defines */ -#include +#if 0 +#ifdef HAVE_GETPT +# define _GNU_SOURCE +#endif +#endif + +#include #ifdef HAVE_STDLIB_H -# include +# include #endif #ifdef HAVE_SYS_TYPES_H # include @@ -38,7 +44,7 @@ # include #endif #if defined(HAVE_STRING_H) -# include +# include #endif #ifdef HAVE_FCNTL_H # include @@ -46,9 +52,12 @@ #ifdef HAVE_SYS_IOCTL_H # include #endif -#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) +#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) # include /* for I_PUSH */ #endif +#ifdef HAVE_ISASTREAM +# include +#endif #ifdef DEBUG_TTY # define D_TTY(x) fprintf x ; fputc('\n', stderr) ; fflush(stderr) @@ -66,7 +75,7 @@ */ /* EXTPROTO */ int -rxvt_get_pty(int *fd_tty, const char **ttydev) +rxvt_get_pty (int *fd_tty, const char **ttydev) { int pfd; @@ -74,15 +83,15 @@ char tty_name[sizeof "/dev/pts/????\0"]; - if (openpty(&pfd, fd_tty, tty_name, NULL, NULL) != -1) + if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) { - *ttydev = strdup(tty_name); + *ttydev = strdup (tty_name); return pfd; } #endif #ifdef PTYS_ARE__GETPTY - *ttydev = _getpty(&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); + *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); if (*ttydev != NULL) return pfd; #endif @@ -91,8 +100,8 @@ char *ptydev; - while ((ptydev = getpty()) != NULL) - if ((pfd = open(ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) + while ((ptydev = getpty ()) != NULL) + if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) { *ttydev = ptydev; return pfd; @@ -104,38 +113,38 @@ { # ifdef PTYS_ARE_GETPT - pfd = getpt(); + pfd = getpt (); # else - pfd = open("/dev/ptmx", O_RDWR | O_NOCTTY, 0); + pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); # endif if (pfd >= 0) { - if (grantpt(pfd) == 0 /* change slave permissions */ - && unlockpt(pfd) == 0) + if (grantpt (pfd) == 0 /* change slave permissions */ + && unlockpt (pfd) == 0) { /* slave now unlocked */ - *ttydev = ptsname(pfd); /* get slave's name */ + *ttydev = ptsname (pfd); /* get slave's name */ return pfd; } - close(pfd); + close (pfd); } } # endif #endif #ifdef PTYS_ARE_PTC - if ((pfd = open("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) + if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) { - *ttydev = ttyname(pfd); + *ttydev = ttyname (pfd); return pfd; } #endif #ifdef PTYS_ARE_CLONE - if ((pfd = open("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) + if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) { - *ttydev = ptsname(pfd); + *ttydev = ptsname (pfd); return pfd; } #endif @@ -147,25 +156,25 @@ char pty_name[] = "/dev/ptyp???"; char tty_name[] = "/dev/ttyp???"; - c1 = &(pty_name[sizeof(pty_name) - 4]); - c2 = &(tty_name[sizeof(tty_name) - 4]); + c1 = & (pty_name[sizeof (pty_name) - 4]); + c2 = & (tty_name[sizeof (tty_name) - 4]); for (idx = 0; idx < 256; idx++) { - sprintf(c1, "%d", idx); - sprintf(c2, "%d", idx); - if (access(tty_name, F_OK) < 0) + sprintf (c1, "%d", idx); + sprintf (c2, "%d", idx); + if (access (tty_name, F_OK) < 0) { idx = 256; break; } - if ((pfd = open(pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) + if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) { - if (access(tty_name, R_OK | W_OK) == 0) + if (access (tty_name, R_OK | W_OK) == 0) { - *ttydev = strdup(tty_name); + *ttydev = strdup (tty_name); return pfd; } - close(pfd); + close (pfd); } } } @@ -185,20 +194,20 @@ for (c1 = PTYCHAR1; *c1; c1++) { - pty_name[(sizeof(pty_name) - 3)] = - tty_name[(sizeof(pty_name) - 3)] = *c1; + pty_name[ (sizeof (pty_name) - 3)] = + tty_name[ (sizeof (pty_name) - 3)] = *c1; for (c2 = PTYCHAR2; *c2; c2++) { - pty_name[(sizeof(pty_name) - 2)] = - tty_name[(sizeof(pty_name) - 2)] = *c2; - if ((pfd = open(pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) + pty_name[ (sizeof (pty_name) - 2)] = + tty_name[ (sizeof (pty_name) - 2)] = *c2; + if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) { - if (access(tty_name, R_OK | W_OK) == 0) + if (access (tty_name, R_OK | W_OK) == 0) { - *ttydev = strdup(tty_name); + *ttydev = strdup (tty_name); return pfd; } - close(pfd); + close (pfd); } } } @@ -229,7 +238,7 @@ #ifndef __QNX__ int fd; - D_TTY ((stderr, "rxvt_control_tty(): pid: %d, tty fd: %d, dev: %s", getpid(), fd_tty, ttydev)); + D_TTY ((stderr, "rxvt_control_tty (): pid: %d, tty fd: %d, dev: %s", getpid (), fd_tty, ttydev)); /* ---------------------------------------- */ # ifdef HAVE_SETSID setsid (); @@ -243,7 +252,7 @@ # ifdef TIOCNOTTY fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - D_TTY ((stderr, "rxvt_control_tty(): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes")); + D_TTY ((stderr, "rxvt_control_tty (): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes")); if (fd >= 0) { ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */ @@ -252,7 +261,7 @@ # endif /* ---------------------------------------- */ fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - D_TTY ((stderr, "rxvt_control_tty(): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)")); + D_TTY ((stderr, "rxvt_control_tty (): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)")); if (fd >= 0) close (fd); /* ouch: still have controlling tty */ /* ---------------------------------------- */ @@ -263,22 +272,22 @@ * ldterm: standard terminal line discipline. * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. * - * After we push the STREAMS modules, the first open() on the slave side + * After we push the STREAMS modules, the first open () on the slave side * (i.e. the next section between the dashes giving us "tty opened OK") * should make the "ptem" (or "ldterm" depending upon either which OS * version or which set of manual pages you have) module give us a - * controlling terminal. We must already have close()d the master side + * controlling terminal. We must already have close ()d the master side * fd in this child process before we push STREAMS modules on because the - * documentation is really unclear about whether it is any close() on - * the master side or the last close() - i.e. a proper STREAMS dismantling - * close() - on the master side which causes a hang up to be sent + * documentation is really unclear about whether it is any close () on + * the master side or the last close () - i.e. a proper STREAMS dismantling + * close () - on the master side which causes a hang up to be sent * through - Geoff Wing */ # ifdef HAVE_ISASTREAM if (isastream (fd_tty) == 1) # endif { - D_TTY ((stderr, "rxvt_control_tty(): Pushing STREAMS modules")); + D_TTY ((stderr, "rxvt_control_tty (): Pushing STREAMS modules")); ioctl (fd_tty, I_PUSH, "ptem"); ioctl (fd_tty, I_PUSH, "ldterm"); ioctl (fd_tty, I_PUSH, "ttcompat"); @@ -287,24 +296,24 @@ /* ---------------------------------------- */ # if defined(TIOCSCTTY) fd = ioctl (fd_tty, TIOCSCTTY, NULL); - D_TTY ((stderr, "rxvt_control_tty(): ioctl(..,TIOCSCTTY): %d", fd)); + D_TTY ((stderr, "rxvt_control_tty (): ioctl (..,TIOCSCTTY): %d", fd)); # elif defined(TIOCSETCTTY) fd = ioctl (fd_tty, TIOCSETCTTY, NULL); - D_TTY ((stderr, "rxvt_control_tty(): ioctl(..,TIOCSETCTTY): %d", fd)); + D_TTY ((stderr, "rxvt_control_tty (): ioctl (..,TIOCSETCTTY): %d", fd)); # else fd = open (ttydev, O_RDWR); - D_TTY ((stderr, "rxvt_control_tty(): tty open%s", fd < 0 ? " failure" : "ed OK")); + D_TTY ((stderr, "rxvt_control_tty (): tty open%s", fd < 0 ? " failure" : "ed OK")); if (fd >= 0) - close(fd); + close (fd); # endif /* ---------------------------------------- */ fd = open ("/dev/tty", O_WRONLY); - D_TTY ((stderr, "rxvt_control_tty(): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)")); + D_TTY ((stderr, "rxvt_control_tty (): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)")); if (fd < 0) return -1; /* fatal */ close (fd); /* ---------------------------------------- */ - D_TTY ((stderr, "rxvt_control_tty(): tcgetpgrp(): %d getpgrp(): %d", tcgetpgrp(fd_tty), getpgrp())); + D_TTY ((stderr, "rxvt_control_tty (): tcgetpgrp (): %d getpgrp (): %d", tcgetpgrp (fd_tty), getpgrp ())); /* ---------------------------------------- */ #endif /* ! __QNX__ */