[Truffle] Use JDK UnixSystem class for getgroups instead of jnr-posix…

… getgroups. * jnr-posix getgroups() is currently broken as it should return a int[]. * it returned only half of the groups.
jruby · Nov 17, 2016 · fa933ff · fa933ff
1 parent 01f3c47
commit fa933ff
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java b/truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java
@@ -19,6 +19,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
+import com.sun.security.auth.module.UnixSystem;
+
 import jnr.constants.platform.Fcntl;
 import jnr.ffi.Pointer;
 import org.jcodings.specific.UTF8Encoding;
@@ -177,25 +179,24 @@ public abstract static class GetGroupsNode extends CoreMethodArrayArgumentsNode
         @TruffleBoundary
         @Specialization(guards = "isNil(pointer)")
         public int getGroupsNil(int max, DynamicObject pointer) {
-            return getContext().getNativePlatform().getPosix().getgroups().length;
+            return getGroups().length;
         }
 
         @TruffleBoundary
         @Specialization(guards = "isRubyPointer(pointer)")
         public int getGroups(int max, DynamicObject pointer) {
-            final long[] groups = getContext().getNativePlatform().getPosix().getgroups();
-
             final Pointer pointerValue = Layouts.POINTER.getPointer(pointer);
-
-            for (int n = 0; n < groups.length && n < max; n++) {
-                // TODO CS 16-May-15 this is platform dependent
+            final long[] groups = getGroups();
+            for (int n = 0; n < groups.length; n++) {
                 pointerValue.putInt(4 * n, (int) groups[n]);
-
             }
-
             return groups.length;
         }
 
+        @TruffleBoundary
+        private static long[] getGroups() {
+            return new UnixSystem().getGroups();
+        }
     }
 
     @CoreMethod(names = "getrlimit", isModuleFunction = true, required = 2, lowerFixnum = 1, unsafe = {UnsafeGroup.PROCESSES, UnsafeGroup.MEMORY})