jruby · Oct 19, 2017 · Oct 19, 2017
Showing with 14 additions and 0 deletions.

+1 −0 .travis.yml

+2 −0 core/src/main/java/org/jruby/util/RegularFileResource.java

+4 −0 core/src/main/java/org/jruby/util/ResourceException.java

+2 −0 core/src/main/java/org/jruby/util/io/PosixShim.java

+5 −0 test/jruby/test_io.rb
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ cache:
    - $HOME/.m2
 
 before_install:
+  - unset _JAVA_OPTIONS
   - rm ~/.m2/settings.xml
   - export MAVEN_SKIP_RC=true
   - mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=180M"; else export MAVEN_OPTS="-XX:MaxMetaspaceSize=180M -XX:CompressedClassSpaceSize=180M"; fi

diff --git a/core/src/main/java/org/jruby/util/RegularFileResource.java b/core/src/main/java/org/jruby/util/RegularFileResource.java
@@ -173,6 +173,8 @@ public Channel openChannel(ModeFlags flags, int perm) throws ResourceException {
                         throw new ResourceException.TooManySymlinks(absolutePath());
                     case EISDIR:
                         throw new ResourceException.FileIsDirectory(absolutePath());
+                    case ENOTDIR:
+                        throw new ResourceException.FileIsNotDirectory(absolutePath());
                     default:
                         throw new ResourceException.IOError(new IOException("unhandled errno: " + errno));
 

diff --git a/core/src/main/java/org/jruby/util/ResourceException.java b/core/src/main/java/org/jruby/util/ResourceException.java
@@ -32,6 +32,10 @@ public static class FileIsDirectory extends ErrnoException {
         public FileIsDirectory(String path) { super("EISDIR", path); }
     }
 
+    public static class FileIsNotDirectory extends ErrnoException {
+        public FileIsNotDirectory(String path) { super ("ENOTDIR", path); }
+    }
+
     public static class FileExists extends ErrnoException {
         public FileExists(String path) { super("EEXIST", path); }
     }

diff --git a/core/src/main/java/org/jruby/util/io/PosixShim.java b/core/src/main/java/org/jruby/util/io/PosixShim.java
@@ -416,6 +416,8 @@ public Channel open(String cwd, String path, ModeFlags flags, int perm) {
             errno = Errno.EEXIST;
         } catch (ResourceException.FileIsDirectory e) {
             errno = Errno.EISDIR;
+        } catch (ResourceException.FileIsNotDirectory e) {
+            errno = Errno.ENOTDIR;
         } catch (ResourceException.NotFound e) {
             errno = Errno.ENOENT;
         } catch (ResourceException.PermissionDenied e) {

diff --git a/test/jruby/test_io.rb b/test/jruby/test_io.rb
@@ -205,6 +205,11 @@ def test_open_with_block
     assert_raises(Errno::EBADF) { f.close }
   end
 
+  def test_open_child_of_file
+    ensure_files @file
+    assert_raises(WINDOWS ? Errno::ENOENT : Errno::ENOTDIR) { File.open(File.join(@file, 'child')) }
+  end
+
   unless WINDOWS # Windows doesn't take kindly to perm mode tests
     def test_sysopen
       ensure_files @file