Changeset ea4910b in mainline for uspace/lib/posix/src/string.c

Timestamp:

2018-11-30T10:04:57Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

26f5bdf, 4aba581

Parents:

c483fca

git-author:

Jiri Svoboda <jiri@…> (2018-11-29 18:02:24)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-30 10:04:57)

Message:

strdup(), strndup(), strnlen() are commonly used extensions so move them to libc (native ports can use these).

File:

• uspace/lib/posix/src/string.c (modified) (2 diffs)

uspace/lib/posix/src/string.c

@@ -135 +135 @@
 
 /**
- * Duplicate a string.
- *
- * @param s String to be duplicated.
- * @return Newly allocated copy of the string.
- */
-char *strdup(const char *s)
-{
-        return strndup(s, SIZE_MAX);
-}
-
-/**
- * Duplicate a specific number of bytes from a string.
- *
- * @param s String to be duplicated.
- * @param n Maximum length of the resulting string..
- * @return Newly allocated string copy of length at most n.
- */
-char *strndup(const char *s, size_t n)
-{
-        assert(s != NULL);
-
-        size_t len = strnlen(s, n);
-        char *dup = malloc(len + 1);
-        if (dup == NULL) {
-                return NULL;
-        }
-
-        memcpy(dup, s, len);
-        dup[len] = '\0';
-
-        return dup;
-}
-
-/**
  * Scan string for a first occurence of a character.
  *
@@ -225 +191 @@
 
         return EOK;
-}
-
-/**
- * Get limited length of the string.
- *
- * @param s String which length shall be determined.
- * @param n Maximum number of bytes that can be examined to determine length.
- * @return The lower of either string length or n limit.
- */
-size_t strnlen(const char *s, size_t n)
-{
-        assert(s != NULL);
-
-        for (size_t sz = 0; sz < n; ++sz) {
-
-                if (s[sz] == '\0') {
-                        return sz;
-                }
-        }
-
-        return n;
 }