lib: add u16_strcpy/strdup functions

Add u16_strcpy() and u16_strdup(). The latter function will be
used later in implementing efi HII database protocol.

Signed-off-by: Akashi Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/include/charset.h b/include/charset.h
index 4d45e24..65087f7 100644 (file)
--- a/include/charset.h
+++ b/include/charset.h
@@ -192,6 +192,29 @@ size_t u16_strlen(const u16 *in);
 size_t u16_strnlen(const u16 *in, size_t count);
 
 /**
+ * u16_strcpy() - copy u16 string
+ *
+ * Copy u16 string pointed to by src, including terminating null word, to
+ * the buffer pointed to by dest.
+ *
+ * @dest:              destination buffer
+ * @src:               source buffer (null terminated)
+ * Return:             'dest' address
+ */
+u16 *u16_strcpy(u16 *dest, const u16 *src);
+
+/**
+ * u16_strdup() - duplicate u16 string
+ *
+ * Copy u16 string pointed to by src, including terminating null word, to a
+ * newly allocated buffer.
+ *
+ * @src:               source buffer (null terminated)
+ * Return:             allocated new buffer on success, NULL on failure
+ */
+u16 *u16_strdup(const u16 *src);
+
+/**
  * utf16_to_utf8() - Convert an utf16 string to utf8
  *
  * Converts 'size' characters of the utf16 string 'src' to utf8

diff --git a/lib/charset.c b/lib/charset.c
index 10557b9..5e349ed 100644 (file)
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -349,6 +349,35 @@ size_t u16_strnlen(const u16 *in, size_t count)
        return i;
 }
 
+u16 *u16_strcpy(u16 *dest, const u16 *src)
+{
+       u16 *tmp = dest;
+
+       for (;; dest++, src++) {
+               *dest = *src;
+               if (!*src)
+                       break;
+       }
+
+       return tmp;
+}
+
+u16 *u16_strdup(const u16 *src)
+{
+       u16 *new;
+
+       if (!src)
+               return NULL;
+
+       new = malloc((u16_strlen(src) + 1) * sizeof(u16));
+       if (!new)
+               return NULL;
+
+       u16_strcpy(new, src);
+
+       return new;
+}
+
 /* Convert UTF-16 to UTF-8.  */
 uint8_t *utf16_to_utf8(uint8_t *dest, const uint16_t *src, size_t size)
 {