[PATCH] fgetgrent

[PATCH] fgetgrent

[Isaac Dunham]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

The attached patch adds support for fgetgrent; which is basically a version of getgrent that expects you to open the right file yourself.
The main use is software for administering multiple systems; I added it to compile heirloom-pkgtools, which provide that functionality.

One could redefine getgrent to call __fgetgrent, but I was more eager to get the software at the time.

-- 
Isaac Dunham <idunham@lavabit.com>

[-- Attachment #2: fgetgrent.diff --]
[-- Type: text/x-diff, Size: 958 bytes --]

diff --git a/include/grp.h b/include/grp.h
index 030d7f8..cb40e07 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -30,6 +30,10 @@ struct group  *getgrent(void);
 void           endgrent(void);
 void           setgrent(void);
 
+#ifdef _GNU_SOURCE
+struct group  *fgetgrent(FILE *stream);
+#endif
+
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 int getgrouplist(const char *, gid_t, gid_t *, int *);
 int setgroups(size_t, const gid_t *);
diff --git a/src/passwd/getgrent.c b/src/passwd/getgrent.c
index 429a3e5..d59bcb6 100644
--- a/src/passwd/getgrent.c
+++ b/src/passwd/getgrent.c
@@ -10,6 +10,17 @@ void setgrent()
 
 weak_alias(setgrent, endgrent);
 
+struct group *__fgetgrent(FILE *f)
+{
+	static char *line, **mem;
+	static struct group gr;
+	size_t size=0, nmem=0;
+	if (!f) return 0;
+	return __getgrent_a(f, &gr, &line, &size, &mem, &nmem);
+}
+
+weak_alias(__fgetgrent,fgetgrent);
+
 struct group *getgrent()
 {
 	static char *line, **mem;