* lisp.h (lispstpcpy): Rename from lispstrcpy, and act like stpcpy.

All callers changed.
* xterm.c (x_term_init): Use new functionality to avoid two needs
to compute a string length.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1b721b042be..e24e86ce412 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10902,8 +10902,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
   dpyinfo->x_id = ++x_display_id;
   dpyinfo->x_id_name = xmalloc (SBYTES (Vinvocation_name)
                                 + SBYTES (Vsystem_name) + 2);
-  strcat (strcat (lispstrcpy (dpyinfo->x_id_name, Vinvocation_name), "@"),
-          SSDATA (Vsystem_name));
+  char *nametail = lispstpcpy (dpyinfo->x_id_name, Vinvocation_name);
+  *nametail++ = '@';
+  lispstpcpy (nametail, Vsystem_name);
 
   /* Figure out which modifier bits mean what.  */
   x_find_modifier_meanings (dpyinfo);