Changeset 095003a8 in mainline for uspace/lib/libc

Timestamp:

2009-04-09T22:32:23Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f4b1535

Parents:

7afb4a5

Message:

strdup() → str_dup()

Location:

uspace/lib/libc

Files:

• generic/string.c (modified) (3 diffs)
• generic/vfs/vfs.c (modified) (1 diff)
• include/string.h (modified) (2 diffs)

uspace/lib/libc/generic/string.c

@@ -41 +41 @@
 #include <errno.h>
 #include <align.h>
+#include <mem.h>
 #include <string.h>
 
@@ -807 +808 @@
 }
 
-char *strncpy(char *dest, const char *src, size_t n)
-{
-        char *orig = dest;
-        
-        while ((*(dest++) = *(src++)) && --n)
-                ;
-        return orig;
-}
-
 char *strcat(char *dest, const char *src)
 {
@@ -827 +819 @@
 }
 
-char * strdup(const char *s1)
-{
-        size_t len = str_size(s1) + 1;
-        void *ret = malloc(len);
-
-        if (ret == NULL)
+char *str_dup(const char *src)
+{
+        size_t size = str_size(src);
+        void *dest = malloc(size + 1);
+
+        if (dest == NULL)
                 return (char *) NULL;
 
-        return (char *) memcpy(ret, s1, len);
+        return (char *) memcpy(dest, src, size + 1);
 }
 

uspace/lib/libc/generic/vfs/vfs.c

@@ -100 +100 @@
          * though they both point into the same dynamically allocated buffer.
          */
-        ncwd_path = strdup(ncwd_path);
+        ncwd_path = str_dup(ncwd_path);
         free(ncwd_path_nc);
         if (!ncwd_path) {

uspace/lib/libc/include/string.h

@@ -79 +79 @@
 extern bool wstr_remove(wchar_t *str, count_t pos);
 
+extern char *str_dup(const char *);
+
 /*
  * TODO: Get rid of this.
@@ -87 +89 @@
 
 extern char *strcpy(char *, const char *);
-extern char *strncpy(char *, const char *, size_t);
-
 extern char *strcat(char *, const char *);
-
-extern char *strdup(const char *);
 
 extern long int strtol(const char *, char **, int);