Take advantage of mempcpy() and stpcpy()

* src/makeint.h (stpcpy): Add missing declaration.
* src/amiga.c (MyExecute): Avoid extra strlen using stpcpy.
* src/function.c (func_shell_base): Ditto.
(func_error): Use memcpy() not strcpy() when we know the length.
* src/job.c (construct_command_argv_internal): Use stpcpy().
* src/main.c (main): Ditto.
(define_makeflags): Ditto.
* src/variable.c (print_target_variables): Use memcpy() when we know
the length.
* src/commands.c (set_file_variables): Use mempcpy().
* src/expand.c (variable_buffer_output): Ditto.
* src/file.c (expand_deps): Ditto.
* src/function.c (abspath): Ditto.
(handle_function): Ditto.
* src/implicit.c (pattern_search): Ditto.
* src/job.c (construct_command_argv_internal): Use mempcpy() and
don't add multiple spaces when there are no shell flags.
* src/main.c (decode_env_switches): Use mempcpy() to simplify.
(define_makeflags): Ditto.
* src/variable.c (selective_vpath_search): Ditto.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/commands.c b/src/commands.c
index 154d5dea..3dd1953f 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -213,8 +213,7 @@ set_file_variables (struct file *file, const char *stem)
 #endif
             len = strlen (c);
 
-          memcpy (cp, c, len);
-          cp += len;
+          cp = mempcpy (cp, c, len);
           *cp++ = FILE_LIST_SEPARATOR;
           if (! (d->changed || always_make_flag))
             qmark_len -= len + 1;       /* Don't space in $? for this one.  */
@@ -284,19 +283,16 @@ set_file_variables (struct file *file, const char *stem)
 
         if (d->ignore_mtime)
           {
-            memcpy (bp, c, len);
-            bp += len;
+            bp = mempcpy (bp, c, len);
             *bp++ = FILE_LIST_SEPARATOR;
           }
         else
           {
-            memcpy (cp, c, len);
-            cp += len;
+            cp = mempcpy (cp, c, len);
             *cp++ = FILE_LIST_SEPARATOR;
             if (d->changed || always_make_flag)
               {
-                memcpy (qp, c, len);
-                qp += len;
+                qp = mempcpy (qp, c, len);
                 *qp++ = FILE_LIST_SEPARATOR;
               }
           }