lib/string/: Move string-related files to string/ subdir

Signed-off-by: Alejandro Colomar <alx@kernel.org>
alejandro-colomar · Dec 3, 2023 · dbb37b1 · dbb37b1
1 parent d1ad64b
commit dbb37b1
Show file tree

Hide file tree

Showing 42 changed files with 52 additions and 52 deletions.
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -134,17 +134,19 @@ libshadow_la_SOURCES = \
 	shell.c \
 	sizeof.h \
 	spawn.c \
-	sprintf.c \
-	sprintf.h \
 	sssd.c \
 	sssd.h \
-	stpecpy.c \
-	stpecpy.h \
-	stpeprintf.c \
-	stpeprintf.h \
-	strncpy.h \
-	strtcpy.c \
-	strtcpy.h \
+	string/sprintf.c \
+	string/sprintf.h \
+	string/stpecpy.c \
+	string/stpecpy.h \
+	string/stpeprintf.c \
+	string/stpeprintf.h \
+	string/strncpy.h \
+	string/strtcpy.c \
+	string/strtcpy.h \
+	string/zustr2stp.c \
+	string/zustr2stp.h \
 	strtoday.c \
 	sub.c \
 	subordinateio.h \
@@ -162,9 +164,7 @@ libshadow_la_SOURCES = \
 	xgetgrnam.c \
 	xgetgrgid.c \
 	xgetspnam.c \
-	yesno.c \
-	zustr2stp.c \
-	zustr2stp.h
+	yesno.c
 
 if WITH_TCB
 libshadow_la_SOURCES += tcbfuncs.c tcbfuncs.h

diff --git a/lib/console.c b/lib/console.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include "getdef.h"
 #include "prototypes.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 #ident "$Id$"
 

diff --git a/lib/copydir.c b/lib/copydir.c
@@ -36,7 +36,7 @@
 #include <attr/libattr.h>
 #endif				/* WITH_ATTR */
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 static /*@null@*/const char *src_orig;

diff --git a/lib/date_to_str.c b/lib/date_to_str.c
@@ -11,7 +11,7 @@
 
 #ident "$Id$"
 
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 #include "prototypes.h"
 
 

diff --git a/lib/env.c b/lib/env.c
@@ -20,7 +20,7 @@
 #include "prototypes.h"
 #include "defines.h"
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 /*

diff --git a/lib/failure.c b/lib/failure.c
@@ -19,7 +19,7 @@
 #include "failure.h"
 #include "memzero.h"
 #include "prototypes.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 
 #define	YEAR	(365L*DAY)

diff --git a/lib/getdef.c b/lib/getdef.c
@@ -25,7 +25,7 @@
 #include "alloc.h"
 #include "getdef.h"
 #include "shadowlog_internal.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 /*

diff --git a/lib/idmapping.c b/lib/idmapping.c
@@ -15,7 +15,7 @@
 
 #include "alloc.h"
 #include "prototypes.h"
-#include "stpeprintf.h"
+#include "string/stpeprintf.h"
 #include "idmapping.h"
 #if HAVE_SYS_CAPABILITY_H
 #include <sys/prctl.h>

diff --git a/lib/log.c b/lib/log.c
@@ -19,8 +19,8 @@
 #include <lastlog.h>
 #include "memzero.h"
 #include "prototypes.h"
-#include "strncpy.h"
-#include "strtcpy.h"
+#include "string/strncpy.h"
+#include "string/strtcpy.h"
 
 
 /*

diff --git a/lib/mail.c b/lib/mail.c
@@ -17,7 +17,7 @@
 
 #include "alloc.h"
 #include "getdef.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 #ident "$Id$"
 

diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c
@@ -28,7 +28,7 @@
 #endif				/* ENABLE_SUBIDS */
 #include "getdef.h"
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 static char *passwd_db_file = NULL;

diff --git a/lib/setupenv.c b/lib/setupenv.c
@@ -27,7 +27,7 @@
 #include <pwd.h>
 #include "getdef.h"
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 #ifndef USE_PAM

diff --git a/lib/sprintf.c → lib/string/sprintf.c b/lib/sprintf.c → lib/string/sprintf.c
@@ -7,7 +7,7 @@
 
 #ident "$Id$"
 
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 #include <stdarg.h>
 #include <stddef.h>

diff --git a/lib/sprintf.h → lib/string/sprintf.h b/lib/sprintf.h → lib/string/sprintf.h
diff --git a/lib/stpecpy.c → lib/string/stpecpy.c b/lib/stpecpy.c → lib/string/stpecpy.c
@@ -11,7 +11,7 @@
 
 #ident "$Id$"
 
-#include "stpecpy.h"
+#include "string/stpecpy.h"
 
 
 extern inline char *stpecpy(char *dst, char *end, const char *restrict src);

diff --git a/lib/stpecpy.h → lib/string/stpecpy.h b/lib/stpecpy.h → lib/string/stpecpy.h
diff --git a/lib/stpeprintf.c → lib/string/stpeprintf.c b/lib/stpeprintf.c → lib/string/stpeprintf.c
@@ -11,7 +11,7 @@
 
 #ident "$Id$"
 
-#include "stpeprintf.h"
+#include "string/stpeprintf.h"
 
 #include <stdarg.h>
 

diff --git a/lib/stpeprintf.h → lib/string/stpeprintf.h b/lib/stpeprintf.h → lib/string/stpeprintf.h
diff --git a/lib/strncpy.h → lib/string/strncpy.h b/lib/strncpy.h → lib/string/strncpy.h
diff --git a/lib/strtcpy.c → lib/string/strtcpy.c b/lib/strtcpy.c → lib/string/strtcpy.c
@@ -11,7 +11,7 @@
 
 #ident "$Id$"
 
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 
 extern inline ssize_t strtcpy(char *restrict dst, const char *restrict src,

diff --git a/lib/strtcpy.h → lib/string/strtcpy.h b/lib/strtcpy.h → lib/string/strtcpy.h
diff --git a/lib/zustr2stp.c → lib/string/zustr2stp.c b/lib/zustr2stp.c → lib/string/zustr2stp.c
@@ -10,7 +10,7 @@
 
 #ident "$Id$"
 
-#include "zustr2stp.h"
+#include "string/zustr2stp.h"
 
 
 extern inline char *zustr2stp(char *restrict dst, const char *restrict src,

diff --git a/lib/zustr2stp.h → lib/string/zustr2stp.h b/lib/zustr2stp.h → lib/string/zustr2stp.h
diff --git a/lib/utmp.c b/lib/utmp.c
@@ -24,9 +24,9 @@
 
 #include "alloc.h"
 #include "sizeof.h"
-#include "strtcpy.h"
-#include "strncpy.h"
-#include "zustr2stp.h"
+#include "string/strncpy.h"
+#include "string/strtcpy.h"
+#include "string/zustr2stp.h"
 
 #ident "$Id$"
 

diff --git a/src/chage.c b/src/chage.c
@@ -33,7 +33,7 @@
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 #ifdef WITH_TCB
 #include "tcbfuncs.h"
 #endif

diff --git a/src/chfn.c b/src/chfn.c
@@ -32,7 +32,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 /*
  * Global variables.

diff --git a/src/chsh.c b/src/chsh.c
@@ -31,7 +31,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 #ifndef SHELLS_FILE
 #define SHELLS_FILE "/etc/shells"

diff --git a/src/gpasswd.c b/src/gpasswd.c
@@ -35,7 +35,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 /*
  * Global variables

diff --git a/src/groupmod.c b/src/groupmod.c
@@ -38,8 +38,8 @@
 #include "sgroupio.h"
 #endif
 #include "shadowlog.h"
-#include "stpecpy.h"
-#include "stpeprintf.h"
+#include "string/stpecpy.h"
+#include "string/stpeprintf.h"
 /*
  * exit status values
  */

diff --git a/src/login.c b/src/login.c
@@ -37,7 +37,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 #ifdef USE_PAM
 #include "pam_defs.h"

diff --git a/src/logoutd.c b/src/logoutd.c
@@ -20,7 +20,7 @@
 #include "prototypes.h"
 #include "shadowlog.h"
 #include "sizeof.h"
-#include "zustr2stp.h"
+#include "string/zustr2stp.h"
 /*
  * Global variables
  */

diff --git a/src/passwd.c b/src/passwd.c
@@ -32,7 +32,7 @@
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 /*
  * exit status values

diff --git a/src/su.c b/src/su.c
@@ -58,7 +58,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 /*
  * Global variables

diff --git a/src/sulogin.c b/src/sulogin.c
@@ -27,7 +27,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 /*
  * Global variables

diff --git a/src/useradd.c b/src/useradd.c
@@ -63,7 +63,7 @@
 #include "tcbfuncs.h"
 #endif
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 #ifndef SKEL_DIR

diff --git a/src/userdel.c b/src/userdel.c
@@ -52,7 +52,7 @@
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 /*

diff --git a/src/usermod.c b/src/usermod.c
@@ -58,7 +58,7 @@
 #include "tcbfuncs.h"
 #endif
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 /*

diff --git a/src/vipw.c b/src/vipw.c
@@ -44,7 +44,7 @@
 #include "tcbfuncs.h"
 #endif				/* WITH_TCB */
 #include "shadowlog.h"
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 #define MSG_WARN_EDIT_OTHER_FILE _( \

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
@@ -60,7 +60,7 @@ test_strncpy_LDADD = \
     $(NULL)
 
 test_strtcpy_SOURCES = \
-    ../../lib/strtcpy.c \
+    ../../lib/string/strtcpy.c \
     test_strtcpy.c \
     $(NULL)
 test_strtcpy_CFLAGS = \
@@ -73,7 +73,7 @@ test_strtcpy_LDADD = \
     $(NULL)
 
 test_xasprintf_SOURCES = \
-    ../../lib/sprintf.c \
+    ../../lib/string/sprintf.c \
     test_xasprintf.c \
     $(NULL)
 test_xasprintf_CFLAGS = \

diff --git a/tests/unit/test_strncpy.c b/tests/unit/test_strncpy.c
@@ -15,7 +15,7 @@
 #include <cmocka.h>
 
 #include "sizeof.h"
-#include "strncpy.h"
+#include "string/strncpy.h"
 
 
 static void test_STRNCPY_trunc(void **state);

diff --git a/tests/unit/test_strtcpy.c b/tests/unit/test_strtcpy.c
@@ -15,7 +15,7 @@
 #include <cmocka.h>
 
 #include "sizeof.h"
-#include "strtcpy.h"
+#include "string/strtcpy.h"
 
 
 static void test_STRTCPY_trunc(void **state);

diff --git a/tests/unit/test_xasprintf.c b/tests/unit/test_xasprintf.c
@@ -15,7 +15,7 @@
 #include <stdint.h>  // Required by <cmocka.h>
 #include <cmocka.h>
 
-#include "sprintf.h"
+#include "string/sprintf.h"
 
 
 #define assert_unreachable()  assert_true(0)