From: Alejandro Colomar <alx@kernel.org>
Date: Sun, 12 Nov 2023 13:08:42 +0000 (+0100)
Subject: src/, lib/, tests/: Rename files defining strtcpy()
X-Git-Tag: 4.15.0-rc1~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9fb85588915f66803594bd6e682111bcb87dae1;p=thirdparty%2Fshadow.git

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 d6b639c60..1c482ef61 100644
--- 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 9284cf638..b1d58c978 100644
--- 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 58773b715..098004703 100644
--- 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 56c6cd3fc..fb5c093be 100644
--- 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 0ee688943..c3e457c97 100644
--- 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 c35cae4ee..60e90c8aa 100644
--- 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 c676f1f99..c11195ff9 100644
--- 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 9d972662a..c08a50c81 100644
--- 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 c7572f71d..a4a59447d 100644
--- 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 13eeb426d..676086195 100644
--- 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 6f66b3e31..a5731335e 100644
--- 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 8b43ee7ae..4e1d601dd 100644
--- 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 46794d666..a732c5f85 100644
--- 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 0dec0b74d..935a30cfb 100644
--- 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);