Changes in uspace/lib/libc/generic/string.c [fc6dd18:dd2cfa7] in mainline

File:

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

uspace/lib/libc/generic/string.c

@@ -471 +471 @@
  * null-terminated and containing only complete characters.
  *
- * @param dest   Destination buffer.
+ * @param dst   Destination buffer.
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
@@ -505 +505 @@
  * have to be null-terminated.
  *
- * @param dest   Destination buffer.
+ * @param dst   Destination buffer.
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
@@ -537 +537 @@
  * null-terminated and containing only complete characters.
  *
- * @param dest   Destination buffer.
+ * @param dst   Destination buffer.
  * @param count Size of the destination buffer.
  * @param src   Source string.
@@ -549 +549 @@
 }
 
-/** Convert wide string to string.
- *
- * Convert wide string @a src to string. The output is written to the buffer
- * specified by @a dest and @a size. @a size must be non-zero and the string
- * written will always be well-formed.
- *
- * @param dest  Destination buffer.
- * @param size  Size of the destination buffer.
- * @param src   Source wide string.
- */
-void wstr_to_str(char *dest, size_t size, const wchar_t *src)
-{
+/** Copy NULL-terminated wide string to string
+ *
+ * Copy source wide string @a src to destination buffer @a dst.
+ * No more than @a size bytes are written. NULL-terminator is always
+ * written after the last succesfully copied character (i.e. if the
+ * destination buffer is has at least 1 byte, it will be always
+ * NULL-terminated).
+ *
+ * @param src   Source wide string.
+ * @param dst   Destination buffer.
+ * @param count Size of the destination buffer.
+ *
+ */
+void wstr_nstr(char *dst, const wchar_t *src, size_t size)
+{
+        /* No space for the NULL-terminator in the buffer */
+        if (size == 0)
+                return;
+        
         wchar_t ch;
-        size_t src_idx;
-        size_t dest_off;
-
-        /* There must be space for a null terminator in the buffer. */
-        assert(size > 0);
-        
-        src_idx = 0;
-        dest_off = 0;
-
+        size_t src_idx = 0;
+        size_t dst_off = 0;
+        
         while ((ch = src[src_idx++]) != 0) {
-                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
+                if (chr_encode(ch, dst, &dst_off, size) != EOK)
                         break;
         }
-
-        dest[dest_off] = '\0';
-}
-
-/** Convert wide string to new string.
- *
- * Convert wide string @a src to string. Space for the new string is allocated
- * on the heap.
- *
- * @param src   Source wide string.
- * @return      New string.
- */
-char *wstr_to_astr(const wchar_t *src)
-{
-        char dbuf[STR_BOUNDS(1)];
-        char *str;
-        wchar_t ch;
-
-        size_t src_idx;
-        size_t dest_off;
-        size_t dest_size;
-
-        /* Compute size of encoded string. */
-
-        src_idx = 0;
-        dest_size = 0;
-
-        while ((ch = src[src_idx++]) != 0) {
-                dest_off = 0;
-                if (chr_encode(ch, dbuf, &dest_off, STR_BOUNDS(1)) != EOK)
-                        break;
-                dest_size += dest_off;
-        }
-
-        str = malloc(dest_size + 1);
-        if (str == NULL)
-                return NULL;
-
-        /* Encode string. */
-
-        src_idx = 0;
-        dest_off = 0;
-
-        while ((ch = src[src_idx++]) != 0) {
-                if (chr_encode(ch, str, &dest_off, dest_size) != EOK)
-                        break;
-        }
-
-        str[dest_size] = '\0';
-        return str;
-}
-
-
-/** Convert string to wide string.
- *
- * Convert string @a src to wide string. The output is written to the
- * buffer specified by @a dest and @a dlen. @a dlen must be non-zero
- * and the wide string written will always be null-terminated.
- *
- * @param dest  Destination buffer.
- * @param dlen  Length of destination buffer (number of wchars).
- * @param src   Source string.
- */
-void str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
-{
-        size_t offset;
-        size_t di;
-        wchar_t c;
-
-        assert(dlen > 0);
-
-        offset = 0;
-        di = 0;
-
-        do {
-                if (di >= dlen - 1)
-                        break;
-
-                c = str_decode(src, &offset, STR_NO_LIMIT);
-                dest[di++] = c;
-        } while (c != '\0');
-
-        dest[dlen - 1] = '\0';
+        
+        if (dst_off >= size)
+                dst[size - 1] = 0;
+        else
+                dst[dst_off] = 0;
 }
 
@@ -896 +819 @@
 }
 
-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.
@@ -947 +843 @@
 }
 
+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)
 {