Yet more rework to make __getgrent and the functions that use it

reentrant...
 -Erik

1 files changed, 18 insertions, 1 deletions

diff --git a/libc/pwd_grp/getgrgid.c b/libc/pwd_grp/getgrgid.c
index dc9176d39..5efca964a 100644
--- a/libc/pwd_grp/getgrgid.c
+++ b/libc/pwd_grp/getgrgid.c
@@ -24,6 +24,20 @@
 #include <paths.h>
 #include "config.h"
 
+
+#ifdef __UCLIBC_HAS_THREADS__
+#include <pthread.h>
+static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
+# define LOCK   pthread_mutex_lock(&mylock)
+# define UNLOCK pthread_mutex_unlock(&mylock);
+#else
+# define LOCK
+# define UNLOCK
+#endif
+static char *line_buff = NULL;
+static char **members = NULL;
+
+
 struct group *getgrgid(const gid_t gid)
 {
     struct group *group;
@@ -32,13 +46,16 @@ struct group *getgrgid(const gid_t gid)
     if ((grp_fd = open(_PATH_GROUP, O_RDONLY)) < 0)
 	return NULL;
 
-    while ((group = __getgrent(grp_fd)) != NULL)
+    LOCK;
+    while ((group = __getgrent(grp_fd, line_buff, members)) != NULL)
 	if (group->gr_gid == gid) {
 	    close(grp_fd);
+	    UNLOCK;
 	    return group;
 	}
 
     close(grp_fd);
+    UNLOCK;
     return NULL;
 }