Merge branch 'lc_useVersion' into collect

1 files changed, 13 insertions, 16 deletions

diff --git a/src/utils.nim b/src/utils.nim
index e46a8e0..da9618b 100644
--- a/src/utils.nim
+++ b/src/utils.nim
@@ -211,26 +211,23 @@ proc forkWaitRedirect*(call: () -> int): tuple[output: seq[string], code: int] =
 proc getgrouplist*(user: cstring, group: Gid, groups: ptr cint, ngroups: var cint): cint
   {.importc, header: "<grp.h>".}
 
+
 proc setgroups*(size: csize_t, groups: ptr cint): cint
   {.importc, header: "<grp.h>".}
 
 proc getUser(uid: int): User =
-  while true:
-    var pw = getpwent()
-    if pw == nil:
-      endpwent()
-      raise newException(CatchableError, "")
-    if pw.pw_uid.int == uid:
-      var groups: array[100, cint]
-      var ngroups: cint = 100
-      if getgrouplist(pw.pw_name, pw.pw_gid, addr(groups[0]), ngroups) < 0:
-        raise newException(CatchableError, "")
-      else:
-        let groupsSeq = groups[0 .. ngroups - 1].map(x => x.int)
-        let res = ($pw.pw_name, pw.pw_uid.int, pw.pw_gid.int, groupsSeq,
-          $pw.pw_dir, $pw.pw_shell)
-        endpwent()
-        return res
+  var pw = getpwuid(Uid(uid))
+  if pw == nil:
+    raise newException(CatchableError, "")
+  var groups: array[100, cint]
+  var ngroups: cint = 100
+  if getgrouplist(pw.pw_name, pw.pw_gid, addr(groups[0]), ngroups) < 0:
+    raise newException(CatchableError, "")
+  else:
+    let groupsSeq = groups[0 .. ngroups - 1].map(x => x.int)
+    let res = ($pw.pw_name, pw.pw_uid.int, pw.pw_gid.int, groupsSeq,
+      $pw.pw_dir, $pw.pw_shell)
+    return res
 
 let currentUser* = getUser(getuid().int)