Changeset 371bd7d in mainline for uspace/lib/c/generic/str.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/c/generic/str.c (moved) (moved from uspace/lib/libc/generic/string.c ) (4 diffs)

uspace/lib/c/generic/str.c

@@ -34 +34 @@
  */
 
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -43 +43 @@
 #include <align.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -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)
 {