lib/shadow/, lib/: gshadow: Move to separate file and rename

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0d1d81ed51776a9ad514e4ff70e085ef919d0074..fdbdc968d4986d55aba59ede89d6a68ab6582456 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -174,6 +174,8 @@ libshadow_la_SOURCES = \
        sgroupio.h \
        shadow/grp/agetgroups.c \
        shadow/grp/agetgroups.h \
+       shadow/gshadow/gshadow.c \
+       shadow/gshadow/gshadow.h \
        shadow/gshadow/putsgent.c \
        shadow/gshadow/putsgent.h \
        shadowio.c \

diff --git a/lib/gshadow.c b/lib/gshadow.c
index 4d692a28ec2746a0bfa4b940c67f067074cb5087..4c5ac4191742324e0c4223c4bf1e3ba186c07e57 100644 (file)
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -22,13 +22,13 @@
 #include "alloc/realloc.h"
 #include "defines.h"
 #include "prototypes.h"
+#include "shadow/gshadow/gshadow.h"
 #include "string/strcmp/streq.h"
 #include "string/strtok/stpsep.h"
 #include "string/strtok/strsep2arr.h"
 #include "string/strtok/xastrsep2ls.h"
 
 
-static /*@null@*/FILE *shadow;
 static struct sgrp  sgroup = {};
 
 
@@ -48,20 +48,20 @@ build_list(char *s)
 
 void setsgent (void)
 {
-       if (NULL != shadow) {
-               rewind (shadow);
+       if (NULL != gshadow) {
+               rewind(gshadow);
        } else {
-               shadow = fopen (SGROUP_FILE, "re");
+               gshadow = fopen(SGROUP_FILE, "re");
        }
 }
 
 void endsgent (void)
 {
-       if (NULL != shadow) {
-               (void) fclose (shadow);
+       if (NULL != gshadow) {
+               fclose(gshadow);
        }
 
-       shadow = NULL;
+       gshadow = NULL;
 }
 
 /*@observer@*//*@null@*/struct sgrp *
@@ -150,10 +150,10 @@ sgetsgent(const char *s)
 
 /*@observer@*//*@null@*/struct sgrp *getsgent (void)
 {
-       if (NULL == shadow) {
+       if (NULL == gshadow) {
                setsgent ();
        }
-       return (fgetsgent (shadow));
+       return fgetsgent(gshadow);
 }
 
 /*

diff --git a/lib/shadow/gshadow/gshadow.c b/lib/shadow/gshadow/gshadow.c
new file mode 100644 (file)
index 0000000..1fa0fe5
--- /dev/null
+++ b/lib/shadow/gshadow/gshadow.c
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2005, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008-2009, Nicolas François
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include "config.h"
+
+#include "shadow/gshadow/gshadow.h"
+
+#include <stddef.h>
+#include <stdio.h>
+
+
+FILE  *gshadow = NULL;

diff --git a/lib/shadow/gshadow/gshadow.h b/lib/shadow/gshadow/gshadow.h
new file mode 100644 (file)
index 0000000..b2a1ef9
--- /dev/null
+++ b/lib/shadow/gshadow/gshadow.h
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 1988-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1997, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2005, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_SHADOW_GSHADOW_GSHADOW_H_
+#define SHADOW_INCLUDE_LIB_SHADOW_GSHADOW_GSHADOW_H_
+
+
+#include "config.h"
+
+#include <stdio.h>
+
+
+extern FILE  *gshadow;
+
+
+#endif  // include guard