libc+apps: Avoid calling endpwent() and endgrent() after every call to get{pw,gr}{nam,uid,gid}

apps/chown.cpp

@@ -40,6 +40,8 @@ Result<int> luna_main(int argc, char** argv)
                 }
 
                 gid = grp->gr_gid;
+
+                endgrent();
             }
         }
     }
@@ -73,6 +75,8 @@ Result<int> luna_main(int argc, char** argv)
 
                 gid = pw->pw_gid;
             }
+
+            endpwent();
         }
     }
 

apps/sh.cpp

@@ -74,6 +74,7 @@ Result<int> luna_main(int argc, char** argv)
         struct passwd* pw = getpwuid(getuid());
         if (pw) { username = pw->pw_name; }
         else { username = getenv("USER"); }
+        endpwent();
     }
 
     while (1)

apps/su.cpp

@@ -78,6 +78,8 @@ Result<int> luna_main(int argc, char** argv)
         return 1;
     }
 
+    endpwent();
+
     if ((prompt_password || getuid() != geteuid()) && *entry->pw_passwd)
     {
         char* pass = getpass();

libc/src/grp.cpp

@@ -1,4 +1,5 @@
 #include <errno.h>
+#include <fcntl.h>
 #include <grp.h>
 #include <luna/Vector.h>
 #include <stdio.h>
@@ -20,6 +21,7 @@ extern "C"
         {
             f = fopen("/etc/group", "r");
             if (!f) return nullptr;
+            fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
         }
 
         while (true)
@@ -82,14 +84,9 @@ extern "C"
 
         while ((entry = getgrent()))
         {
-            if (!strcmp(entry->gr_name, name))
+            if (!strcmp(entry->gr_name, name)) { return entry; }
-            {
-                endgrent();
-                return entry;
-            }
         }
 
-        endgrent();
         return entry;
     }
 
@@ -101,14 +98,9 @@ extern "C"
 
         while ((entry = getgrent()))
         {
-            if (entry->gr_gid == gid)
+            if (entry->gr_gid == gid) { return entry; }
-            {
-                endgrent();
-                return entry;
-            }
         }
 
-        endgrent();
         return entry;
     }
 

libc/src/pwd.cpp

@@ -1,3 +1,4 @@
+#include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,6 +46,7 @@ extern "C"
         {
             f = fopen("/etc/passwd", "r");
             if (!f) return nullptr;
+            fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
         }
 
         while (true)
@@ -93,14 +95,9 @@ extern "C"
 
         while ((entry = getpwent()))
         {
-            if (!strcmp(entry->pw_name, name))
+            if (!strcmp(entry->pw_name, name)) { return entry; }
-            {
-                endpwent();
-                return entry;
-            }
         }
 
-        endpwent();
         return entry;
     }
 
@@ -112,14 +109,9 @@ extern "C"
 
         while ((entry = getpwent()))
         {
-            if (entry->pw_uid == uid)
+            if (entry->pw_uid == uid) { return entry; }
-            {
-                endpwent();
-                return entry;
-            }
         }
 
-        endpwent();
         return entry;
     }