src/, lib/, tests/: Rename files defining strtcpy()

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d6b639c60f12231d4b6f88b202206114aef66869..1c482ef612358842baf928fdb87ef66cb9859ea5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -141,7 +141,7 @@ libshadow_la_SOURCES = \
        stpecpy.h \
        stpeprintf.c \
        stpeprintf.h \
-       strlcpy.h \
+       strtcpy.h \
        strtoday.c \
        sub.c \
        subordinateio.h \

diff --git a/lib/console.c b/lib/console.c
index 9284cf6382a0889c197d988d142c1bc8ab63d7e8..b1d58c978855bbd3cd75cb654b9d8058afa65528 100644 (file)
--- a/lib/console.c
+++ b/lib/console.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include "getdef.h"
 #include "prototypes.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 #ident "$Id$"
 

diff --git a/lib/strlcpy.c b/lib/strtcpy.c
similarity index 93%
rename from lib/strlcpy.c
rename to lib/strtcpy.c
index 58773b71567a0009e68635004c16b596125e61f4..09800470343e626249c62f7ca26e73f6f52e1109 100644 (file)
--- a/lib/strlcpy.c
+++ b/lib/strtcpy.c
@@ -11,7 +11,7 @@
 
 #ident "$Id$"
 
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 
 extern inline ssize_t strtcpy(char *restrict dst, const char *restrict src,

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

diff --git a/lib/utmp.c b/lib/utmp.c
index 56c6cd3fcc31d575d3f2602732e187f945fcb15d..fb5c093be4f2880fb703b44e474f4f54ffacd29a 100644 (file)
--- a/lib/utmp.c
+++ b/lib/utmp.c
@@ -24,7 +24,7 @@
 
 #include "alloc.h"
 #include "sizeof.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 #include "zustr2stp.h"
 
 #ident "$Id$"

diff --git a/src/chage.c b/src/chage.c
index 0ee688943a851a9873654e82736a877f3326e53a..c3e457c97ab9e60bf2354301fe34b011dda72e71 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -33,7 +33,7 @@
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 #ifdef WITH_TCB
 #include "tcbfuncs.h"
 #endif

diff --git a/src/chfn.c b/src/chfn.c
index c35cae4eeb27c49b77e262ef09de77d9f255dcc1..60e90c8aa41a6ab0bca202ff3af9366278c98f22 100644 (file)
--- a/src/chfn.c
+++ b/src/chfn.c
@@ -32,7 +32,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 /*
  * Global variables.

diff --git a/src/chsh.c b/src/chsh.c
index c676f1f994736ac6c6bc112d5de209898f6ebe40..c11195ff939cae21e4f212ae7cd9757e959469ff 100644 (file)
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -31,7 +31,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 #ifndef SHELLS_FILE
 #define SHELLS_FILE "/etc/shells"

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 9d972662a66a9212b8bd0b999034df0c4ffe494e..c08a50c8104ef76524764cb17a228aa7e0a14e04 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -34,7 +34,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 /*
  * Global variables

diff --git a/src/login.c b/src/login.c
index c7572f71d74137c12f4bfca9af59e5f6779383ee..a4a59447de7dc51b498f9d408e86a2ef55a569b4 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -36,7 +36,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 #ifdef USE_PAM
 #include "pam_defs.h"

diff --git a/src/passwd.c b/src/passwd.c
index 13eeb426d45207509bfe033709eb1e746285f113..6760861958230dc4980a4cf0690cd9b565cf7867 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -32,7 +32,7 @@
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 /*
  * exit status values

diff --git a/src/su.c b/src/su.c
index 6f66b3e311756b2efc30e146cb5da16124864504..a5731335e85d30d9320934541d345acc70ebee93 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -57,7 +57,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 /*
  * Global variables

diff --git a/src/sulogin.c b/src/sulogin.c
index 8b43ee7ae9c49b12cb7a059efd658c8b7fad7c5c..4e1d601dd4b4f6a31cbf56e64bbe6ba1ad1ac3b7 100644 (file)
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -26,7 +26,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 /*
  * Global variables

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 46794d66614681399c327c97491317245e24af56..a732c5f8548bd57509085d25236e97b3830c5851 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -4,7 +4,7 @@ if HAVE_CMOCKA
 TESTS = $(check_PROGRAMS)
 
 check_PROGRAMS = \
-    test_strlcpy \
+    test_strtcpy \
     test_xasprintf
 
 if ENABLE_LOGIND
@@ -32,16 +32,16 @@ test_logind_LDADD = \
     $(LIBSYSTEMD) \
     $(NULL)
 
-test_strlcpy_SOURCES = \
-    ../../lib/strlcpy.c \
-    test_strlcpy.c \
+test_strtcpy_SOURCES = \
+    ../../lib/strtcpy.c \
+    test_strtcpy.c \
     $(NULL)
-test_strlcpy_CFLAGS = \
+test_strtcpy_CFLAGS = \
     $(AM_FLAGS) \
     $(NULL)
-test_strlcpy_LDFLAGS = \
+test_strtcpy_LDFLAGS = \
     $(NULL)
-test_strlcpy_LDADD = \
+test_strtcpy_LDADD = \
     $(CMOCKA_LIBS) \
     $(NULL)
 

diff --git a/tests/unit/test_strlcpy.c b/tests/unit/test_strtcpy.c
similarity index 98%
rename from tests/unit/test_strlcpy.c
rename to tests/unit/test_strtcpy.c
index 0dec0b74d1ddb24828c4b70590a852d35d6a55ce..935a30cfb5133306e52a78a310399986d785e082 100644 (file)
--- a/tests/unit/test_strlcpy.c
+++ b/tests/unit/test_strtcpy.c
@@ -15,7 +15,7 @@
 #include <cmocka.h>
 
 #include "sizeof.h"
-#include "strlcpy.h"
+#include "strtcpy.h"
 
 
 static void test_STRTCPY_trunc(void **state);