X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fmemmove.c;h=f7ed6c1656b38d43e3f0a5afb8478a8cf895efe2;hb=c8f799d852e3698468a78954d82588e841cc0b70;hp=ba73742ce0fda71718d004ee5d0228140b8a8be6;hpb=e5456e3c2697c4e17fc9aa3439f2e305517b4d96;p=pdclib.old

diff --git a/functions/string/memmove.c b/functions/string/memmove.c
index ba73742..f7ed6c1 100644
--- a/functions/string/memmove.c
+++ b/functions/string/memmove.c
@@ -1,38 +1,31 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
+ * $Id$
+ * ----------------------------------------------------------------------------
+ * Public Domain C Library - http://pdclib.sourceforge.net
+ * This code is Public Domain. Use, modify, and redistribute at will.
+ * --------------------------------------------------------------------------*/
 
-void * memmove( void * s1, const void * s2, size_t n ) { /* TODO */ };
+#include <__size_t.h>
 
-/* PDPC code - unreviewed
+void * memmove( void * dest, const void * src, size_t n )
 {
-    char *p = s1;
-    const char *cs2 = s2;
-    size_t x;
-    
-    if (p <= cs2)
+    const char * src_p = (const char *) src;
+    char * dest_p = (char *) dest;
+    if ( dest_p < src_p )
     {
-        for (x=0; x < n; x++)
+        while ( n-- )
         {
-            *p = *cs2;
-            p++;
-            cs2++;
+            *dest_p++ = *src_p++;
         }
     }
     else
     {
-        if (n != 0)
+        src_p += n;
+        dest_p += n;
+        while ( n-- )
         {
-            for (x=n-1; x > 0; x--)
-            {
-                *(p+x) = *(cs2+x);
-            }
+            *dest_p-- = *src_p--;
         }
-        *(p+x) = *(cs2+x);
     }
-    return (s1);
+    return dest;
 }
-*/
\ No newline at end of file