]> gitweb.factorcode.org Git - factor.git/commitdiff
unix.groups: Return an empty sequence if the user in 'user user-groups' doesn't exist.
authorDoug Coleman <doug.coleman@gmail.com>
Fri, 3 Feb 2012 03:58:24 +0000 (19:58 -0800)
committerDoug Coleman <doug.coleman@gmail.com>
Fri, 3 Feb 2012 03:58:24 +0000 (19:58 -0800)
basis/unix/groups/groups-tests.factor
basis/unix/groups/groups.factor

index 4fd633f8cbd0ff6539e6b53f9e296684b987993a..53a8a593ea5445c22e55f25515af347b0937b551 100644 (file)
@@ -40,3 +40,6 @@ IN: unix.groups.tests
 
 { f }
 [ "root" user-groups empty? ] unit-test
+
+{ t }
+[ "29032039029302930290390329uafjklajsdfkasjflaskjflsadkjfroot" user-groups empty? ] unit-test
index 531768656f580e5f552be19e16faf78b622ad5e8..cfd37b0e566aeab9cd4253cdaf3ec40d1d1ea59d 100644 (file)
@@ -70,9 +70,13 @@ ERROR: no-group string ;
     [ 4 grouping:group ] dip head-slice [ uint deref group-name ] map ;
 
 : (user-groups) ( string -- seq )
-    dup user-passwd gid>> 64 [ 4 * <byte-array> ] keep
-    int <ref> [ [ unix.ffi:getgrouplist ] unix-system-call drop ] 2keep
-    int deref >groups ;
+    dup user-passwd [
+        gid>> 64 [ 4 * <byte-array> ] keep
+        int <ref> [ [ unix.ffi:getgrouplist ] unix-system-call drop ] 2keep
+        int deref >groups
+    ] [
+        drop { }
+    ] if* ;
 
 PRIVATE>