---

yaml
---
r: 106458
b: refs/heads/try
c: 8c157ed
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
-refs/heads/try: 40ab198356bbec05b308b2e61ebc6fe9e23ade9d
+refs/heads/try: 8c157ed63d95b4b4ff122493228eb0b5acf1e2ae
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libnative/io/mod.rs

@@ -105,6 +105,13 @@ fn translate_error(errno: i32, detail: bool) -> IoError {
             libc::WSAEADDRINUSE => (io::ConnectionRefused, "address in use"),
             libc::ERROR_BROKEN_PIPE => (io::EndOfFile, "the pipe has ended"),
 
+            // libuv maps this error code to EISDIR. we do too. if it is found
+            // to be incorrect, we can add in some more machinery to only
+            // return this message when ERROR_INVALID_FUNCTION after certain
+            // win32 calls.
+            libc::ERROR_INVALID_FUNCTION => (io::InvalidInput,
+                                             "illegal operation on a directory"),
+
             x => {
                 debug!("ignoring {}: {}", x, os::last_os_error());
                 (io::OtherIoError, "unknown error")
@@ -127,6 +134,7 @@ fn translate_error(errno: i32, detail: bool) -> IoError {
             libc::EADDRNOTAVAIL => (io::ConnectionRefused, "address not available"),
             libc::EADDRINUSE => (io::ConnectionRefused, "address in use"),
             libc::ENOENT => (io::FileNotFound, "no such file or directory"),
+            libc::EISDIR => (io::InvalidInput, "illegal operation on a directory"),
 
             // These two constants can have the same value on some systems, but
             // different values on others, so we can't use a match clause

branches/try/src/libstd/libc.rs

@@ -1623,6 +1623,7 @@ pub mod consts {
             pub static O_NOINHERIT: c_int = 128;
 
             pub static ERROR_SUCCESS : c_int = 0;
+            pub static ERROR_INVALID_FUNCTION: c_int = 1;
             pub static ERROR_FILE_NOT_FOUND: c_int = 2;
             pub static ERROR_ACCESS_DENIED: c_int = 5;
             pub static ERROR_INVALID_HANDLE : c_int = 6;