Changeset 619 for trunk/libs/mini-libc/string.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (5 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

• trunk/libs/mini-libc/string.c (modified) (1 diff)

trunk/libs/mini-libc/string.c

@@ -80 +80 @@
 
 
-///////////////////////////
-char * strcpy (char * dest,
+//////////////////////////
+char * strcpy (char * dst,
                char * src )
 {
-        char *src_ptr = src;
-        char *dst_ptr = dest;
-
-        while(*src_ptr) *(dst_ptr++) = *(src_ptr++);
-
-        *dst_ptr = 0;
-        return dest;
-}
-
-////////////////////////////////////
-char * strncpy( char         * dest,
+        while( *src )
+    {
+        *(dst) = *(src);
+        dst++;
+        src++;
+    }
+        
+    // set NUL terminating character
+        *dst = 0;
+
+        return dst;
+}
+
+///////////////////////////////////
+char * strncpy( char         * dst,
                 char         * src,
-                unsigned int   n )
+                unsigned int   count )
 {
         unsigned int i;
 
-        for (i = 0; (i < n) && (src[i] != '\0') ; i++) dest[i] = src[i];
-
-        for (; i < n; i++) dest[i] = '\0';
-
-        return dest;
+    // copy at most count characters
+        for (i = 0 ; (i < count) && (src[i] != '\0') ; i++) dst[i] = src[i];
+
+    // complete with NUL characters
+        for ( ; i < count ; i++) dst[i] = '\0';
+
+        return dst;
 }