diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-11-28 16:45:34 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-11-28 16:45:34 +0000 |
| commit | d8a5f0469569be846a7292b2ec591c49031ead40 (patch) | |
| tree | 8d1cc6712f40ee20e70f5ecb4812fa9918aa0554 | |
| parent | 023a2fa789b7700ed32f8d78655c03b4b273d42b (diff) | |
| download | cygnal-d8a5f0469569be846a7292b2ec591c49031ead40.tar.gz cygnal-d8a5f0469569be846a7292b2ec591c49031ead40.tar.bz2 cygnal-d8a5f0469569be846a7292b2ec591c49031ead40.zip | |
* fhandler_tape.cc (mtinfo::initialize): Use MAX_PATH instead of
CYG_MAX_PATH.
* fhandler_tty.cc (fhandler_pty_master::ptsname): Set buffer size to
TTY_NAME_MAX.
* syscalls.cc (ttyname): Eliminate the `+ 1' from the name buffer size
since TTY_NAME_MAX already counts the trailing NUL.
* libc/bsdlib.cc (openpty): Set pts buffer size to TTY_NAME_MAX.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_tape.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/libc/bsdlib.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1cb0448a7..da8f6d120 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,15 @@ 2007-11-28 Corinna Vinschen <corinna@vinschen.de> + * fhandler_tape.cc (mtinfo::initialize): Use MAX_PATH instead of + CYG_MAX_PATH. + * fhandler_tty.cc (fhandler_pty_master::ptsname): Set buffer size to + TTY_NAME_MAX. + * syscalls.cc (ttyname): Eliminate the `+ 1' from the name buffer size + since TTY_NAME_MAX already counts the trailing NUL. + * libc/bsdlib.cc (openpty): Set pts buffer size to TTY_NAME_MAX. + +2007-11-28 Corinna Vinschen <corinna@vinschen.de> + * fhandler_socket.cc (fhandler_socket::recv_internal): Add MSG_WAITALL handling. Use explicit flag values instead of MSG_WINMASK. (fhandler_socket::send_internal): Use explicit flag values instead of diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc index 036407685..565aaa7ca 100644 --- a/winsup/cygwin/fhandler_tape.cc +++ b/winsup/cygwin/fhandler_tape.cc @@ -1130,7 +1130,7 @@ mtinfo_drive::ioctl (HANDLE mt, unsigned int cmd, void *buf) void mtinfo::initialize () { - char name[CYG_MAX_PATH]; + char name[MAX_PATH]; HANDLE mtx; shared_name (name, "mtinfo_mutex", 0); diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index e86531ef0..6fed0e0f1 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -1300,7 +1300,7 @@ fhandler_pty_master::ioctl (unsigned int cmd, void *arg) char * fhandler_pty_master::ptsname () { - static char buf[32]; + static char buf[TTY_NAME_MAX]; __small_sprintf (buf, "/dev/tty%d", get_unit ()); return buf; diff --git a/winsup/cygwin/libc/bsdlib.cc b/winsup/cygwin/libc/bsdlib.cc index 6a007466f..b61c7aaaf 100644 --- a/winsup/cygwin/libc/bsdlib.cc +++ b/winsup/cygwin/libc/bsdlib.cc @@ -108,7 +108,7 @@ openpty (int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) { int master, slave; - char pts[CYG_MAX_PATH]; + char pts[TTY_NAME_MAX]; if ((master = open ("/dev/ptmx", O_RDWR | O_NOCTTY)) >= 0) { diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 899745f60..32539aad2 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1931,8 +1931,8 @@ ttyname_r (int fd, char *buf, size_t buflen) extern "C" char * ttyname (int fd) { - static char name[TTY_NAME_MAX + 1]; - int ret = ttyname_r (fd, name, TTY_NAME_MAX + 1); + static char name[TTY_NAME_MAX]; + int ret = ttyname_r (fd, name, TTY_NAME_MAX); if (ret) { set_errno (ret); |