From 38d09743e0390d35f122d3e9db33256a1ac06df6 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 2 Feb 2012 19:53:42 -0800
Subject: [PATCH] unix.groups: Get the second parameter to getgrouplist from
 /etc/passwd.

---
 basis/unix/groups/groups-tests.factor | 3 +++
 basis/unix/groups/groups.factor       | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/basis/unix/groups/groups-tests.factor b/basis/unix/groups/groups-tests.factor
index 4f3b0172ac..4fd633f8cb 100644
--- a/basis/unix/groups/groups-tests.factor
+++ b/basis/unix/groups/groups-tests.factor
@@ -37,3 +37,6 @@ IN: unix.groups.tests
 
 [ f ]
 [ all-group-names drop all-group-names empty? ] unit-test
+
+{ f }
+[ "root" user-groups empty? ] unit-test
diff --git a/basis/unix/groups/groups.factor b/basis/unix/groups/groups.factor
index 9abdb25e82..531768656f 100644
--- a/basis/unix/groups/groups.factor
+++ b/basis/unix/groups/groups.factor
@@ -70,10 +70,9 @@ ERROR: no-group string ;
     [ 4 grouping:group ] dip head-slice [ uint deref group-name ] map ;
 
 : (user-groups) ( string -- seq )
-    #! first group is -1337, legacy unix code
-    -1337 64 [ 4 * <byte-array> ] keep
+    dup user-passwd gid>> 64 [ 4 * <byte-array> ] keep
     int <ref> [ [ unix.ffi:getgrouplist ] unix-system-call drop ] 2keep
-    [ 4 tail-slice ] [ int deref 1 - ] bi* >groups ;
+    int deref >groups ;
 
 PRIVATE>