Changeset 5eb5dcf in mainline for uspace/lib/libc/generic/string.c

Timestamp:

2010-01-06T20:56:04Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fccc236

Parents:

002252a (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/libc/generic/string.c (modified) (2 diffs)

uspace/lib/libc/generic/string.c

@@ -896 +896 @@
 }
 
+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(dest, src, size + 1);
+}
+
+char *str_ndup(const char *src, size_t max_size)
+{
+        size_t size = str_size(src);
+        if (size > max_size)
+                size = max_size;
+        
+        char *dest = (char *) malloc(size + 1);
+        
+        if (dest == NULL)
+                return (char *) NULL;
+        
+        memcpy(dest, src, size);
+        dest[size] = 0;
+        return dest;
+}
+
 
 /** Convert initial part of string to unsigned long according to given base.
@@ -920 +947 @@
 }
 
-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(dest, src, size + 1);
-}
-
 char *strtok(char *s, const char *delim)
 {