From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 14 Oct 2025 10:50:42 +0000 (+0200)
Subject: */: s/STRNCAT/strncat_a/
X-Git-Tag: 4.19.0-rc1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ddc73dbafc37999fd15b46707fba1ba1d4d538a;p=thirdparty%2Fshadow.git

*/: s/STRNCAT/strncat_a/

This name better reflects that it handles arrays, and doesn't shout.

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

diff --git a/lib/string/README b/lib/string/README
index 37eb4f1d7..1123206b7 100644
--- a/lib/string/README
+++ b/lib/string/README
@@ -177,7 +177,7 @@ strcpy/ - String copying
     STRNCPYTAIL()
 	Like strncpytail, but takes an array.
 
-    STRNCAT()  // To be removed
+    strncat_a()  // To be removed
 	Do NOT use.  I'll remove it soon.
 
   s/
diff --git a/lib/string/strcpy/strncat.h b/lib/string/strcpy/strncat.h
index 15911684c..754b6450c 100644
--- a/lib/string/strcpy/strncat.h
+++ b/lib/string/strcpy/strncat.h
@@ -13,7 +13,8 @@
 #include "sizeof.h"
 
 
-#define STRNCAT(dst, src)  strncat(dst, src, countof(src))
+// strncat_a - nonstring catenate-into-string array
+#define strncat_a(dst, src)  strncat(dst, src, countof(src))
 
 
 #endif  // include guard
diff --git a/src/logoutd.c b/src/logoutd.c
index 2d4ec1737..8e03f65a9 100644
--- a/src/logoutd.c
+++ b/src/logoutd.c
@@ -207,7 +207,7 @@ main(int argc, char **argv)
 			else
 				strcpy(tty_name, "");
 
-			STRNCAT(tty_name, ut->ut_line);
+			strncat_a(tty_name, ut->ut_line);
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
 #endif