lib/string/strdup/xstrdup.[ch], lib/, src/: Move xstrdup() to its own file

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

lib/Makefile.am

@@ -160,6 +160,8 @@ libshadow_la_SOURCES = \
 	string/strcpy/strtcpy.h \
 	string/strdup/strndupa.c \
 	string/strdup/strndupa.h \
+	string/strdup/xstrdup.c \
+	string/strdup/xstrdup.h \
 	string/strdup/xstrndup.c \
 	string/strdup/xstrndup.h \
 	string/strftime.c \

lib/alloc.c

@@ -1,12 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
- * SPDX-FileCopyrightText: 2023       , Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 /* Replacements for malloc and strdup with error checking.  Too trivial
    to be worth copyrighting :-).  I did that because a lot of code used
@@ -19,8 +16,6 @@
 
 #include <config.h>
 
-#ident "$Id$"
-
 #include "alloc.h"
 
 #include <errno.h>
@@ -36,7 +31,6 @@ extern inline void *xmalloc(size_t size);
 extern inline void *xmallocarray(size_t nmemb, size_t size);
 extern inline void *mallocarray(size_t nmemb, size_t size);
 extern inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
-extern inline char *xstrdup(const char *str);
 
 
 void *

lib/alloc.h

@@ -15,7 +15,6 @@
 #include <stdlib.h>
 
 #include "attr.h"
-#include "defines.h"
 
 
 #define CALLOC(n, type)   ((type *) calloc(n, sizeof(type)))
@@ -47,8 +46,6 @@ ATTR_MALLOC(free)
 inline void *mallocarray(size_t nmemb, size_t size);
 ATTR_MALLOC(free)
 inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline char *xstrdup(const char *str);
 
 ATTR_MALLOC(free)
 void *xcalloc(size_t nmemb, size_t size);
@@ -91,11 +88,4 @@ reallocarrayf(void *p, size_t nmemb, size_t size)
 }
 
 
-inline char *
-xstrdup(const char *str)
-{
-	return strcpy(XMALLOC(strlen(str) + 1, char), str);
-}
-
-
 #endif  // include guard

lib/env.c

@@ -22,6 +22,7 @@
 #include "shadowlog.h"
 #include "string/sprintf/snprintf.h"
 #include "string/sprintf/xasprintf.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*

lib/list.c

@@ -15,6 +15,9 @@
 #include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
+#include "string/strdup/xstrdup.h"
+
+
 /*
  * add_list - add a member to a list of group members
  *

lib/motd.c

@@ -13,10 +13,12 @@
 
 #include <stdio.h>
 
-#include "alloc.h"
 #include "defines.h"
 #include "getdef.h"
 #include "prototypes.h"
+#include "string/strdup/xstrdup.h"
+
+
 /*
  * motd -- output the /etc/motd file
  *

lib/obscure.c

@@ -15,13 +15,14 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "alloc.h"
 #include "attr.h"
 #include "memzero.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"
 #include "string/sprintf/xasprintf.h"
+#include "string/strdup/xstrdup.h"
+
 
 #if WITH_LIBBSD == 0
 #include "freezero.h"

lib/setupenv.c

@@ -21,13 +21,13 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include <pwd.h>
 #include "getdef.h"
 #include "shadowlog.h"
 #include "string/sprintf/xasprintf.h"
+#include "string/strdup/xstrdup.h"
 
 
 #ifndef USE_PAM

lib/string/strdup/xstrdup.c

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strdup/xstrdup.h"
+
+
+extern inline char *xstrdup(const char *str);

lib/string/strdup/xstrdup.h

@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRDUP_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRDUP_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "alloc.h"
+#include "attr.h"
+
+
+ATTR_MALLOC(free)
+inline char *xstrdup(const char *str);
+
+
+inline char *
+xstrdup(const char *str)
+{
+	return strcpy(XMALLOC(strlen(str) + 1, char), str);
+}
+
+
+#endif  // include guard

lib/utmp.c

@@ -26,6 +26,7 @@
 #include "sizeof.h"
 #include "string/strcpy/strncpy.h"
 #include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 #include "string/strdup/xstrndup.h"
 
 #ident "$Id$"