lib/, po/: sgetpwent(): Move to under lib/shadow/passwd/

Signed-off-by: Alejandro Colomar <alx@kernel.org>
shadow-maint · Feb 16, 2025 · dd9501d · dd9501d
1 parent d52ffeb
commit dd9501d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -166,7 +166,6 @@ libshadow_la_SOURCES = \
 	semanage.c \
 	setugid.c \
 	setupenv.c \
-	sgetpwent.c \
 	sgetspent.c \
 	sgroupio.c \
 	sgroupio.h \
@@ -193,6 +192,8 @@ libshadow_la_SOURCES = \
 	shadow/gshadow/sgetsgent.h \
 	shadow/gshadow/sgrp.c \
 	shadow/gshadow/sgrp.h \
+	shadow/passwd/sgetpwent.c \
+	shadow/passwd/sgetpwent.h \
 	shadowio.c \
 	shadowio.h \
 	shadowlog.c \

diff --git a/lib/prototypes.h b/lib/prototypes.h
@@ -398,9 +398,6 @@ extern void setup (struct passwd *);
 /* setupenv.c */
 extern void setup_env (struct passwd *);
 
-/* sgetpwent.c */
-extern struct passwd *sgetpwent (const char *buf);
-
 /* sgetspent.c */
 #ifndef HAVE_SGETSPENT
 extern struct spwd *sgetspent (const char *string);

diff --git a/lib/pwio.c b/lib/pwio.c
@@ -18,6 +18,8 @@
 #include <stdio.h>
 #include "commonio.h"
 #include "pwio.h"
+#include "shadow/passwd/sgetpwent.h"
+
 
 static /*@null@*/ /*@only@*/void *passwd_dup (const void *ent)
 {

diff --git a/lib/sgetpwent.c → lib/shadow/passwd/sgetpwent.c b/lib/sgetpwent.c → lib/shadow/passwd/sgetpwent.c
@@ -1,15 +1,14 @@
-/*
- * SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 1989-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2005, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008, Nicolas François
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
 
 #include <config.h>
 
-#ident "$Id$"
+#include "shadow/passwd/sgetpwent.h"
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -25,6 +24,7 @@
 
 #define	NFIELDS	7
 
+
 /*
  * sgetpwent - convert a string to a (struct passwd)
  *
@@ -37,6 +37,7 @@
  *	performance reasons.  I am going to come up with some conditional
  *	compilation glarp to improve on this in the future.
  */
+// from-string get pasword entry
 struct passwd *
 sgetpwent(const char *buf)
 {
@@ -105,4 +106,3 @@ sgetpwent(const char *buf)
 
 	return &pwent;
 }
-
diff --git a/lib/shadow/passwd/sgetpwent.h b/lib/shadow/passwd/sgetpwent.h
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_SHADOW_PASSWD_SGETPWENT_H_
+#define SHADOW_INCLUDE_LIB_SHADOW_PASSWD_SGETPWENT_H_
+
+
+#include <config.h>
+
+#include <pwd.h>
+
+
+struct passwd *sgetpwent(const char *s);
+
+
+#endif  // include guard
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -56,11 +56,11 @@ lib/selinux.c
 lib/semanage.c
 lib/setugid.c
 lib/setupenv.c
-lib/sgetpwent.c
 lib/sgetspent.c
 lib/sgroupio.c
 lib/shadow.c
 lib/shadow/group/sgetgrent.c
+lib/shadow/passwd/sgetpwent.c
 lib/shadowio.c
 lib/shadowmem.c
 lib/shell.c