MS-Windows followup to stpcpy changes.

 src/w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead
 of strcat.
 src/w32menu.c (add_menu_item): Use stpcpy instead of strcat.
 src/w32.c (sys_readdir, stat_worker, symlink): Use strcpy instead of
 strcat.

 nt/gnulib.mk (stpcpy, string): Sync with the latest change in
 lib/gnulib.mk.

4 files changed, 26 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f3bc9fd2c87..72601fe7c58 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead
+        of strcat.
+
+        * w32menu.c (add_menu_item): Use stpcpy instead of strcat.
+
+        * w32.c (sys_readdir, stat_worker, symlink): Use strcpy instead of
+        strcat.
+
 2014-12-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for boolean in xsmfns.c
diff --git a/src/w32.c b/src/w32.c
index 8d8f536ca40..6dea0c2a811 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3405,10 +3405,10 @@ sys_readdir (DIR *dirp)
       int ln;
 
       strcpy (filename, dir_pathname);
-      ln = strlen (filename) - 1;
-      if (!IS_DIRECTORY_SEP (filename[ln]))
-        strcat (filename, "\\");
-      strcat (filename, "*");
+      ln = strlen (filename);
+      if (!IS_DIRECTORY_SEP (filename[ln - 1]))
+        filename[ln++] = '\\';
+      strcpy (filename + ln, "*");
 
       /* Note: No need to resolve symlinks in FILENAME, because
          FindFirst opens the directory that is the target of a
@@ -4969,7 +4969,7 @@ stat_worker (const char * path, struct stat * buf, int follow_symlinks)
         {
           /* Make sure root directories end in a slash.  */
           if (!IS_DIRECTORY_SEP (name[len-1]))
-            strcat (name, "\\");
+            strcpy (name + len, "\\");
           if (GetDriveType (name) < 2)
             {
               errno = ENOENT;
@@ -5438,8 +5438,7 @@ symlink (char const *filename, char const *linkname)
         p--;
       if (p > linkfn)
         strncpy (tem, linkfn, p - linkfn);
-      tem[p - linkfn] = '\0';
-      strcat (tem, filename);
+      strcpy (tem + (p - linkfn), filename);
       dir_access = faccessat (AT_FDCWD, tem, D_OK, AT_EACCESS);
     }
   else
diff --git a/src/w32menu.c b/src/w32menu.c
index 6633ffddbcf..287062c702c 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1256,9 +1256,9 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
       if (wv->key != NULL)
         {
           out_string = SAFE_ALLOCA (strlen (wv->name) + strlen (wv->key) + 2);
-          strcpy (out_string, wv->name);
-          strcat (out_string, "\t");
-          strcat (out_string, wv->key);
+          p = stpcpy (out_string, wv->name);
+          p = stpcpy (p, "\t");
+          strcpy (p, wv->key);
         }
       else
         out_string = (char *)wv->name;
diff --git a/src/w32proc.c b/src/w32proc.c
index 09e0c0530a4..c571726d70f 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1665,10 +1665,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
       if (egetenv ("CMDPROXY"))
         strcpy (cmdname, egetenv ("CMDPROXY"));
       else
-        {
-          lispstpcpy (cmdname, Vinvocation_directory);
-          strcat (cmdname, "cmdproxy.exe");
-        }
+        strcpy (lispstpcpy (cmdname, Vinvocation_directory), "cmdproxy.exe");
 
       /* Can't use unixtodos_filename here, since that needs its file
          name argument encoded in UTF-8.  */
@@ -3183,18 +3180,20 @@ get_lcid_callback (LPTSTR locale_num_str)
   if (GetLocaleInfo (try_lcid, LOCALE_SABBREVLANGNAME,
                      locval, LOCALE_NAME_MAX_LENGTH))
     {
+      size_t locval_len;
+
       /* This is for when they only specify the language, as in "ENU".  */
       if (stricmp (locval, lname) == 0)
         {
           found_lcid = try_lcid;
           return FALSE;
         }
-      strcat (locval, "_");
+      locval_len = strlen (locval);
+      strcpy (locval + locval_len, "_");
       if (GetLocaleInfo (try_lcid, LOCALE_SABBREVCTRYNAME,
-                         locval + strlen (locval), LOCALE_NAME_MAX_LENGTH))
+                         locval + locval_len + 1, LOCALE_NAME_MAX_LENGTH))
         {
-          size_t locval_len = strlen (locval);
-
+          locval_len = strlen (locval);
           if (strnicmp (locval, lname, locval_len) == 0
               && (lname[locval_len] == '.'
                   || lname[locval_len] == '\0'))