Changes in kernel/generic/src/lib/string.c [0f06dbc:dd2cfa7] in mainline

File:

• kernel/generic/src/lib/string.c (modified) (3 diffs)

kernel/generic/src/lib/string.c

@@ -537 +537 @@
  * 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.
@@ -571 +571 @@
  * 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.
@@ -596 +596 @@
 }
 
-/** 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';
+        
+        if (dst_off >= size)
+                dst[size - 1] = 0;
+        else
+                dst[dst_off] = 0;
 }