From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 3 Jun 2025 07:06:54 +0000 (+0200)
Subject: lib/, src/: Move prototypes of "lib/fields.c" to "lib/fields.h"
X-Git-Tag: 4.18.0-rc1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36a6391807dc1f9b0e93c4816d793c9f924d9f4d;p=thirdparty%2Fshadow.git

lib/, src/: Move prototypes of "lib/fields.c" to "lib/fields.h"

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 42a439b41..b492d420b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -94,6 +94,7 @@ libshadow_la_SOURCES = \
 	failure.h \
 	fd.c \
 	fields.c \
+	fields.h \
 	find_new_gid.c \
 	find_new_uid.c \
 	find_new_sub_gids.c \
diff --git a/lib/fields.c b/lib/fields.c
index ef8283741..06e741da1 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -9,7 +9,7 @@
 
 #include <config.h>
 
-#ident "$Id$"
+#include "fields.h"
 
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/fields.h b/lib/fields.h
new file mode 100644
index 000000000..293d9bde3
--- /dev/null
+++ b/lib/fields.h
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2025, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+#ifndef _SHADOW_INCLUDE_LIB_FIELDS_H_
+#define _SHADOW_INCLUDE_LIB_FIELDS_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+
+
+int valid_field(const char *field, const char *illegal);
+void change_field(char *buf, size_t maxsize, const char *prompt);
+
+
+#endif  // include guard
diff --git a/lib/groupio.c b/lib/groupio.c
index 516e3ccd2..a4348a1c7 100644
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -19,6 +19,7 @@
 #include "alloc/malloc.h"
 #include "commonio.h"
 #include "defines.h"
+#include "fields.h"
 #include "getdef.h"
 #include "groupio.h"
 #include "prototypes.h"
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 003fef049..d35c38f81 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -120,10 +120,6 @@ extern void sanitize_env (void);
 /* fd.c */
 extern void check_fds (void);
 
-/* fields.c */
-extern void change_field (char *, size_t, const char *);
-extern int valid_field (const char *, const char *);
-
 /* find_new_gid.c */
 extern int find_new_gid (bool sys_group,
                          gid_t *gid,
diff --git a/lib/pwio.c b/lib/pwio.c
index 3497c7545..415447d60 100644
--- a/lib/pwio.c
+++ b/lib/pwio.c
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
 #include <pwd.h>
 #include <stdio.h>
+
 #include "commonio.h"
+#include "defines.h"
+#include "fields.h"
+#include "prototypes.h"
 #include "pwio.h"
 
 static /*@null@*/ /*@only@*/void *passwd_dup (const void *ent)
diff --git a/lib/sgroupio.c b/lib/sgroupio.c
index 980576124..ef82976d0 100644
--- a/lib/sgroupio.c
+++ b/lib/sgroupio.c
@@ -19,6 +19,7 @@
 #include "prototypes.h"
 #include "defines.h"
 #include "commonio.h"
+#include "fields.h"
 #include "getdef.h"
 #include "sgroupio.h"
 #include "string/memset/memzero.h"
diff --git a/lib/shadowio.c b/lib/shadowio.c
index d2c3b4730..8b1c1d2c1 100644
--- a/lib/shadowio.c
+++ b/lib/shadowio.c
@@ -10,20 +10,22 @@
 
 #include <config.h>
 
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
 #include <shadow.h>
 #include <stdio.h>
+
 #include "commonio.h"
+#include "defines.h"
+#include "fields.h"
 #include "getdef.h"
+#include "prototypes.h"
 #include "shadowio.h"
+
 #ifdef WITH_TCB
 #include <tcb.h>
 #include "tcbfuncs.h"
 #endif				/* WITH_TCB */
 
+
 static /*@null@*/ /*@only@*/void *shadow_dup (const void *ent)
 {
 	const struct spwd *sp = ent;
diff --git a/src/chage.c b/src/chage.c
index 49ca47507..4b9c96d69 100644
--- a/src/chage.c
+++ b/src/chage.c
@@ -23,6 +23,7 @@
 
 #include "atoi/a2i/a2s.h"
 #include "defines.h"
+#include "fields.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "shadowio.h"
diff --git a/src/chfn.c b/src/chfn.c
index 834a0a277..585029296 100644
--- a/src/chfn.c
+++ b/src/chfn.c
@@ -22,6 +22,7 @@
 #include "defines.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
+#include "fields.h"
 #include "getdef.h"
 #include "nscd.h"
 #ifdef USE_PAM
diff --git a/src/chsh.c b/src/chsh.c
index b45dca714..236ff7846 100644
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -21,6 +21,7 @@
 #include "defines.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
+#include "fields.h"
 #include "getdef.h"
 #include "nscd.h"
 #include "prototypes.h"