lib/, po/: sgetgrent(): Move to under lib/shadow/group/

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

lib/Makefile.am

@@ -166,12 +166,13 @@ libshadow_la_SOURCES = \
 	semanage.c \
 	setugid.c \
 	setupenv.c \
-	sgetgrent.c \
 	sgetpwent.c \
 	sgetspent.c \
 	sgroupio.c \
 	sgroupio.h \
 	shadow.c \
+	shadow/group/sgetgrent.c \
+	shadow/group/sgetgrent.h \
 	shadow/grp/agetgroups.c \
 	shadow/grp/agetgroups.h \
 	shadow/gshadow/endsgent.c \

lib/groupio.c

@@ -22,6 +22,7 @@
 #include "getdef.h"
 #include "groupio.h"
 #include "prototypes.h"
+#include "shadow/group/sgetgrent.h"
 #include "string/strcmp/streq.h"
 
 

lib/prototypes.h

@@ -398,9 +398,6 @@ extern void setup (struct passwd *);
 /* setupenv.c */
 extern void setup_env (struct passwd *);
 
-/* sgetgrent.c */
-extern struct group *sgetgrent (const char *buf);
-
 /* sgetpwent.c */
 extern struct passwd *sgetpwent (const char *buf);
 

lib/sgetgrent.c renamed to lib/shadow/group/sgetgrent.c

@@ -1,15 +1,14 @@
-/*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2005       , Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2005, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008, Nicolas François
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <[email protected]>
+// SPDX-License-Identifier: BSD-3-Clause
+
 
 #include <config.h>
 
-#ident "$Id$"
+#include "shadow/group/sgetgrent.h"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -27,6 +26,7 @@
 
 #define	NFIELDS	4
 
+
 /*
  * list - turn a comma-separated string into an array of (char *)'s
  *
@@ -64,7 +64,9 @@ list(char *s)
 }
 
 
-struct group *sgetgrent (const char *buf)
+// from-string get group entry
+struct group *
+sgetgrent(const char *buf)
 {
 	static char *grpbuf = NULL;
 	static size_t size = 0;
@@ -105,4 +107,3 @@ struct group *sgetgrent (const char *buf)
 
 	return &grent;
 }
-

lib/shadow/group/sgetgrent.h

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <[email protected]>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_SHADOW_GROUP_SGETGRENT_H_
+#define SHADOW_INCLUDE_LIB_SHADOW_GROUP_SGETGRENT_H_
+
+
+#include <config.h>
+
+#include <grp.h>
+
+
+struct group *sgetgrent(const char *s);
+
+
+#endif  // include guard

po/POTFILES.in

@@ -56,11 +56,11 @@ lib/selinux.c
 lib/semanage.c
 lib/setugid.c
 lib/setupenv.c
-lib/sgetgrent.c
 lib/sgetpwent.c
 lib/sgetspent.c
 lib/sgroupio.c
 lib/shadow.c
+lib/shadow/group/sgetgrent.c
 lib/shadowio.c
 lib/shadowmem.c
 lib/shell.c