Changes in uspace/lib/posix/src/stdio.c [163e34c:694ca3d6] in mainline

File:

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

uspace/lib/posix/src/stdio.c

@@ -232 +232 @@
  * @return The number of written characters.
  */
-static errno_t _dprintf_str_write(const char *str, size_t size, void *fd)
+static int _dprintf_str_write(const char *str, size_t size, void *fd)
 {
         const int fildes = *(int *) fd;
         size_t wr;
-        return vfs_write(fildes, &posix_pos[fildes], str, size, &wr);
+        if (failed(vfs_write(fildes, &posix_pos[fildes], str, size, &wr)))
+                return -1;
+        return str_nlength(str, wr);
+}
+
+/**
+ * Write wide string to the opened file.
+ *
+ * @param str String to be written.
+ * @param size Size of the string (in bytes).
+ * @param fd File descriptor of the opened file.
+ * @return The number of written characters.
+ */
+static int _dprintf_wstr_write(const char32_t *str, size_t size, void *fd)
+{
+        size_t offset = 0;
+        size_t chars = 0;
+        size_t sz;
+        char buf[4];
+
+        while (offset < size) {
+                sz = 0;
+                if (chr_encode(str[chars], buf, &sz, sizeof(buf)) != EOK) {
+                        break;
+                }
+
+                const int fildes = *(int *) fd;
+                size_t nwr;
+                if (vfs_write(fildes, &posix_pos[fildes], buf, sz, &nwr) != EOK)
+                        break;
+
+                chars++;
+                offset += sizeof(char32_t);
+        }
+
+        return chars;
 }
 
@@ -250 +285 @@
 {
         printf_spec_t spec = {
-                .write = _dprintf_str_write,
+                .str_write = _dprintf_str_write,
+                .wstr_write = _dprintf_wstr_write,
                 .data = &fildes
         };