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

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 36e04014d21c352b2e0069ed0adafc05f3841787..cc79326b38321ee59b9e4c996c64b21978b57685 100644 (file)
--- 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
index b1d58c978855bbd3cd75cb654b9d8058afa65528..92065d9b0a9314057b95801cb4af60ce587d3716 100644 (file)
--- 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
index 6d292dafa8001046b009fe9a8812628cf2728afc..a5ea7efba21cab67e42909c8e86fc8084216ea13 100644 (file)
--- 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
index 9ae31f07b3d3000265ac168d0a23204a3a026bbc..cbba0e464c952781f13a50eaab1c6328260632e3 100644 (file)
--- 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
index d823411ec6d7215f0839f38fbd5bb52c1536d9b1..dc35c54d9dff027138faef17ad8e71c16a44429a 100644 (file)
--- 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
index c4a434ffb1c7a89340e0fe7ab3aa3241e15da875..8a196fd8cbec80f1b59cb2c1f92a169b11f546ef 100644 (file)
--- 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
index d64e6343c60fcf46596ab0344765f7c077b85499..1a72453fadf2472323c9087b082c33fea32ef6d2 100644 (file)
--- 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
index a2e74380bf1f016932dbcd670e96007a3d56f458..3fcad8d3c67ababe91a043c616212f7e251adab9 100644 (file)
--- 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
index 6ab1701fabf0fe558eb36586c1109eec00e9e183..c6801185a0438f077cee0defbc52989ece13b7cd 100644 (file)
--- 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
index 5c8b4e6177c814e61ad7e012eaecda85cb8ddf6a..d14bdb18ac1825a5712c14b986c358eb503258ab 100644 (file)
--- 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
index d55aeb97861797378dc5d2807e4a9c504d459ec0..74500ba6d80786c3ff6ade1d798b5c906ac5f374 100644 (file)
--- 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
index f305b866f02898e305dfdd3ba066a9e9623464a2..c9b7f26fef29f2e6f769a791e5ca86efb4cdbe3d 100644 (file)
--- 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 b/lib/string/sprintf.c
similarity index 93%
rename from lib/sprintf.c
rename to lib/string/sprintf.c
index fee58ca9ec659fcda1fb624181e766f493e7fcc2..5b421ad0ebf7a4fd681c192e66cc002429b9523a 100644 (file)
--- a/lib/sprintf.c
+++ b/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 b/lib/string/sprintf.h
similarity index 100%
rename from lib/sprintf.h
rename to lib/string/sprintf.h

diff --git a/lib/stpecpy.c b/lib/string/stpecpy.c
similarity index 91%
rename from lib/stpecpy.c
rename to lib/string/stpecpy.c
index faa02d695a1f80fca7fe12b48c98517f3dd37403..97593884a2aeaf24bde66101f22da5bce4dd33be 100644 (file)
--- a/lib/stpecpy.c
+++ b/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 b/lib/string/stpecpy.h
similarity index 100%
rename from lib/stpecpy.h
rename to lib/string/stpecpy.h

diff --git a/lib/stpeprintf.c b/lib/string/stpeprintf.c
similarity index 93%
rename from lib/stpeprintf.c
rename to lib/string/stpeprintf.c
index f3238eafbebd533828261c30ee27c1d9d9f7bffb..cecd95d7ed1f979cc669bb1b115067c328bd65b9 100644 (file)
--- a/lib/stpeprintf.c
+++ b/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 b/lib/string/stpeprintf.h
similarity index 100%
rename from lib/stpeprintf.h
rename to lib/string/stpeprintf.h

diff --git a/lib/strncpy.h b/lib/string/strncpy.h
similarity index 100%
rename from lib/strncpy.h
rename to lib/string/strncpy.h

diff --git a/lib/strtcpy.c b/lib/string/strtcpy.c
similarity index 91%
rename from lib/strtcpy.c
rename to lib/string/strtcpy.c
index 09800470343e626249c62f7ca26e73f6f52e1109..74de4fc4b5c687e8d02dad8ee210c6b8856ec6e5 100644 (file)
--- a/lib/strtcpy.c
+++ b/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 b/lib/string/strtcpy.h
similarity index 100%
rename from lib/strtcpy.h
rename to lib/string/strtcpy.h

diff --git a/lib/zustr2stp.c b/lib/string/zustr2stp.c
similarity index 90%
rename from lib/zustr2stp.c
rename to lib/string/zustr2stp.c
index 8dfe87057c0cc32ac162830cb66c03459f89cf08..e27ced3fb6a34d44377af3e52d9a7ff2f6a59c6b 100644 (file)
--- a/lib/zustr2stp.c
+++ b/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 b/lib/string/zustr2stp.h
similarity index 100%
rename from lib/zustr2stp.h
rename to lib/string/zustr2stp.h

diff --git a/lib/utmp.c b/lib/utmp.c
index bf878ce6bb7fa33e27c366bb5ccc4a20e9cf077e..dabe8b2e81e1f239ae41b6f1d03be08ce954d162 100644 (file)
--- 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
index c3e457c97ab9e60bf2354301fe34b011dda72e71..025bdb18cee9373e061424f1c843d322bf00f004 100644 (file)
--- 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
index 60e90c8aa41a6ab0bca202ff3af9366278c98f22..417ac35f1c1468228c93672ddf445dc4888b8f4b 100644 (file)
--- 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
index 3ae8b5108a30d574e3eb1179920f6ab7e230eaba..32b3a4d8b95ab12e2c2b092dffb0088f4deae955 100644 (file)
--- 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
index e2aa0b13e001bf548c2fcb596b1665f083e146d0..70002eb1db37b9658bf248c09d0ad453613bcb27 100644 (file)
--- 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
index 3c04cdbd350cedee651d8858f45f6ea3c451948c..084c5d56103d809bb8fddd1642c3940a03ac05b9 100644 (file)
--- 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
index 11abe0639b26ad4c83038e08a8a0c375852e38f0..d5ef87d8a928bc52fcfaaf468c114b65013c5db4 100644 (file)
--- 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
index 41458c3c2673302d6afc0a9c105f1a90f18179ec..11ccf05f691dc64a11e298074cd98efadbf829bc 100644 (file)
--- 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
index a4f493209aa82c707f33d99b46487512ce0b4789..aef5b0512c14937a942a735f35eb9e5fa8916625 100644 (file)
--- 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
index af5f29aee6a00fafc03e7a3d0a236ced1d73c7fc..362841fb882ec8ce0ae2a8fce1bb973e65f8c448 100644 (file)
--- 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
index eb99973f858df1f1ee7de21d1b6da024b5bd7703..0bb9d900b9712b46164395ba35cdd9c27c323044 100644 (file)
--- 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
index 8a5974822f1c4735cd986dde0f8ca8fc4386f468..062daeac0f8edbe9dae8cd441ad0115b3a13f735 100644 (file)
--- 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
index 14bbbd707115a1c17e2b4b02b14e1bd9cad48886..ce7ece22938de4da50dbb610c2102f88147b9f4b 100644 (file)
--- 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
index d279981bb40a36bdf31f2914ffe65364cd776a7a..06fe931cb65bfa61cde7eefe4b975262027bfc0a 100644 (file)
--- 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
index ab1c811643db7fb490524a493a6b6f8779a4b696..50d28eb4200da1edf011caeb5bc815c19a2952e2 100644 (file)
--- 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
index 3e3144ded18de5791e09bb0138e1931ef51a9e6b..7416a1ded6de92a87b22740b916d2dc76cb2c0bc 100644 (file)
--- 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
index f5b189ff7e18717d867ec539b859ed8a5cca3839..968765bb15511e35ba61a9353545a1b59f77edce 100644 (file)
--- 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
index 935a30cfb5133306e52a78a310399986d785e082..12351a5372f99dbc3d0853103c510f98e305fcb9 100644 (file)
--- 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
index 25e36ca59aa34883555ff8205bee3c3b30c5faf9..4b5d0935c4111c4e0798a3d61abda87c40445e70 100644 (file)
--- 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)