From: Jim Meyering <jim@meyering.net>
Date: Wed, 12 Nov 1997 16:28:06 +0000 (+0000)
Subject: [!HAVE_MEMPCPY] (mempcpy): Define.
X-Git-Tag: TEXTUTILS-1_22c~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4842565b62c04d9b6320ce0a547e199ee3bf4c75;p=thirdparty%2Fcoreutils.git

[!HAVE_MEMPCPY] (mempcpy): Define.
(batch_convert): Use mempcpy rather than stpcpy.
---

diff --git a/src/date.c b/src/date.c
index 3d88a0edd4..0ac8a9c279 100644
--- a/src/date.c
+++ b/src/date.c
@@ -28,6 +28,10 @@
 #include "error.h"
 #include "getdate.h"
 
+#ifndef HAVE_MEMPCPY
+# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
+#endif
+
 #ifndef STDC_HEADERS
 size_t strftime ();
 time_t time ();
@@ -140,8 +144,9 @@ batch_convert (const char *input_filename, const char *format)
 	}
       else
 	{
-	  char *buf = xmalloc (3 + strlen (initial_TZ) + 1);
-	  stpcpy (stpcpy (buf, "TZ="), initial_TZ);
+	  size_t tz_len = strlen (initial_TZ);
+	  char *buf = xmalloc (3 + tz_len + 1);
+	  mempcpy (mempcpy (buf, "TZ=", 3), initial_TZ, tz_len + 1);
 	  initial_TZ = buf;
 	}
     }