Permalink
Browse files

Revert "unix: improve uv_guess_handle() implementation"

This reverts commit 98bcddc.

It's making a lot of tests in the node.js test suite fail.
  • Loading branch information...
1 parent fc42885 commit 9aab5d483794be45e9db0ceb9dbee3e9b6f199f5 @bnoordhuis bnoordhuis committed Jan 11, 2013
Showing with 5 additions and 188 deletions.
  1. +5 −39 src/unix/tty.c
  2. +0 −146 test/test-guess-handle.c
  3. +0 −2 test/test-list.h
  4. +0 −1 uv.gyp
View
@@ -27,7 +27,7 @@
#include <termios.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <sys/socket.h>
+
static int orig_termios_fd = -1;
static struct termios orig_termios;
@@ -118,10 +118,7 @@ int uv_tty_get_winsize(uv_tty_t* tty, int* width, int* height) {
uv_handle_type uv_guess_handle(uv_file file) {
- struct stat st;
- struct sockaddr sa;
- socklen_t len;
- int sock_type;
+ struct stat s;
if (file < 0) {
return UV_UNKNOWN_HANDLE;
@@ -131,46 +128,15 @@ uv_handle_type uv_guess_handle(uv_file file) {
return UV_TTY;
}
- if (fstat(file, &st)) {
+ if (fstat(file, &s)) {
return UV_UNKNOWN_HANDLE;
}
- if (S_ISFIFO(st.st_mode)) {
- return UV_NAMED_PIPE;
- }
-
- if (S_ISREG(st.st_mode)) {
+ if (!S_ISSOCK(s.st_mode) && !S_ISFIFO(s.st_mode)) {
return UV_FILE;
}
- if (!S_ISSOCK(st.st_mode)) {
- return UV_UNKNOWN_HANDLE;
- }
-
- len = sizeof sock_type;
- if (getsockopt(file, SOL_SOCKET, SO_TYPE, &sock_type, &len)) {
- return UV_UNKNOWN_HANDLE;
- }
-
- len = sizeof sa;
- if (getsockname(file, &sa, &len)) {
- return UV_UNKNOWN_HANDLE;
- }
-
- if (sock_type == SOCK_STREAM && sa.sa_family == AF_UNIX) {
- return UV_NAMED_PIPE;
- }
- else if (sock_type == SOCK_STREAM &&
- (sa.sa_family == AF_INET || sa.sa_family == AF_INET6)) {
- return UV_TCP;
- }
- else if (sock_type == SOCK_DGRAM &&
- (sa.sa_family == AF_INET || sa.sa_family == AF_INET6)) {
- return UV_UDP;
- }
- else {
- return UV_UNKNOWN_HANDLE;
- }
+ return UV_NAMED_PIPE;
}
@@ -1,146 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "uv.h"
-#include "task.h"
-
-#ifdef _WIN32
-# include <io.h>
-# include <windows.h>
-#else /* Unix */
-# include <fcntl.h>
-# include <unistd.h>
-#endif
-
-/*
- * These tests currently directly use the underlying OS primitives to
- * create handles (file descriptors) under test. This approach makes
- * the most sense as guess_handle is primarily used to determine the
- * type of handles passed to an application using libuv (rather than
- * being used on handles created by libuv itself).
- *
- * TODO: More comprehensive _WIN32 tests are required. Existing WIN32
- * tests are copied from appropriate sections of the TTY test.
- */
-TEST_IMPL(guess_handle) {
- int ttyin_fd, ttyout_fd;
-#ifdef _WIN32
- HANDLE handle;
-#else
- int pipe_fds[2];
- int r;
- int afunix_stream;
- int afinet_stream;
- int afinet6_stream;
- int afinet_dgram;
- int afinet6_dgram;
- int regfile_fd;
- int dir_fd;
- int devnull_fd;
-#endif
-
-#ifdef _WIN32
- handle = CreateFileA("conin$",
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL);
- ASSERT(handle != INVALID_HANDLE_VALUE);
- ttyin_fd = _open_osfhandle((intptr_t) handle, 0);
-
- handle = CreateFileA("conout$",
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL);
- ASSERT(handle != INVALID_HANDLE_VALUE);
- ttyout_fd = _open_osfhandle((intptr_t) handle, 0);
-
-#else /* unix */
- ttyin_fd = open("/dev/tty", O_RDONLY, 0);
- ttyout_fd = open("/dev/tty", O_WRONLY, 0);
- r = pipe(pipe_fds);
- afunix_stream = socket(AF_UNIX, SOCK_STREAM, 0);
- afinet_stream = socket(AF_INET, SOCK_STREAM, 0);
- afinet6_stream = socket(AF_INET6, SOCK_STREAM, 0);
- afinet_dgram = socket(AF_INET, SOCK_DGRAM, 0);
- afinet6_dgram = socket(AF_INET6, SOCK_DGRAM, 0);
- regfile_fd = open("test_file", O_RDONLY | O_CREAT, S_IWRITE | S_IREAD);
- dir_fd = open(".", O_RDONLY, 0);
- devnull_fd = open("/dev/null", O_RDONLY, 0);
-#endif
-
- ASSERT(ttyin_fd >= 0);
- ASSERT(ttyout_fd >= 0);
-#ifndef _WIN32
- ASSERT(r == 0);
- ASSERT(afunix_stream >= 0);
- ASSERT(afinet_stream >= 0);
- ASSERT(afinet6_stream >= 0);
- ASSERT(afinet_dgram >= 0);
- ASSERT(afinet6_dgram >= 0);
- ASSERT(regfile_fd >= 0);
- ASSERT(dir_fd >= 0);
-#endif
-
- ASSERT(UV_UNKNOWN_HANDLE == uv_guess_handle(-1));
- ASSERT(UV_TTY == uv_guess_handle(ttyin_fd));
- ASSERT(UV_TTY == uv_guess_handle(ttyout_fd));
-
-#ifndef _WIN32
- ASSERT(UV_NAMED_PIPE == uv_guess_handle(pipe_fds[0]));
- ASSERT(UV_NAMED_PIPE == uv_guess_handle(pipe_fds[1]));
- ASSERT(UV_NAMED_PIPE == uv_guess_handle(afunix_stream));
- ASSERT(UV_TCP == uv_guess_handle(afinet_stream));
- ASSERT(UV_TCP == uv_guess_handle(afinet6_stream));
- ASSERT(UV_UDP == uv_guess_handle(afinet_dgram));
- ASSERT(UV_UDP == uv_guess_handle(afinet6_dgram));
- ASSERT(UV_FILE == uv_guess_handle(regfile_fd));
- ASSERT(UV_UNKNOWN_HANDLE == uv_guess_handle(dir_fd));
- ASSERT(UV_UNKNOWN_HANDLE == uv_guess_handle(devnull_fd));
-#endif
-
- close(ttyin_fd);
- close(ttyout_fd);
-
-#ifndef _WIN32
- close(pipe_fds[0]);
- close(pipe_fds[1]);
- close(afunix_stream);
- close(afinet_stream);
- close(afinet6_stream);
- close(afinet_dgram);
- close(afinet6_dgram);
- close(regfile_fd);
- unlink("test_file");
- close(dir_fd);
- close(devnull_fd);
-#endif
- /* FIXME: Is anything else required to close the windows
- handles? */
-
- MAKE_VALGRIND_HAPPY();
- return 0;
-}
View
@@ -35,7 +35,6 @@ TEST_DECLARE (semaphore_1)
TEST_DECLARE (semaphore_2)
TEST_DECLARE (semaphore_3)
TEST_DECLARE (tty)
-TEST_DECLARE (guess_handle)
TEST_DECLARE (stdio_over_pipes)
TEST_DECLARE (ipc_listen_before_write)
TEST_DECLARE (ipc_listen_after_write)
@@ -246,7 +245,6 @@ TASK_LIST_START
TEST_ENTRY (pipe_connect_to_file)
TEST_ENTRY (tty)
- TEST_ENTRY (guess_handle)
TEST_ENTRY (stdio_over_pipes)
TEST_ENTRY (ipc_listen_before_write)
TEST_ENTRY (ipc_listen_after_write)
View
@@ -265,7 +265,6 @@
'test/test-get-memory.c',
'test/test-getaddrinfo.c',
'test/test-getsockname.c',
- 'test/test-guess-handle.c',
'test/test-hrtime.c',
'test/test-idle.c',
'test/test-ipc.c',

0 comments on commit 9aab5d4

Please sign in to comment.