Changeset c7c6afd in mainline for uspace

Timestamp:

2025-04-13T23:27:44Z (8 months ago)

Author:

GitHub <noreply@…>

Children:

b6061f8c

Parents:

240b2e4 (diff), f5e1692 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-13 23:27:44)

git-committer:

GitHub <noreply@…> (2025-04-13 23:27:44)

Message:

Merge branch 'HelenOS:master' into master

Location:

uspace/lib

Files:

• c/generic/io/asprintf.c (modified) (2 diffs)
• c/generic/io/kio.c (modified) (2 diffs)
• c/generic/io/vprintf.c (modified) (2 diffs)
• c/generic/io/vsnprintf.c (deleted)
• c/include/stdio.h (modified) (1 diff)
• c/meson.build (modified) (2 diffs)
• posix/src/stdio.c (modified) (2 diffs)

uspace/lib/c/generic/io/asprintf.c

@@ -40 +40 @@
 #include <str.h>
 #include <printf_core.h>
-
-static int asprintf_str_write(const char *str, size_t count, void *unused)
-{
-        return str_nlength(str, count);
-}
-
-static int asprintf_wstr_write(const char32_t *str, size_t count, void *unused)
-{
-        return wstr_nlength(str, count);
-}
-
-int vprintf_length(const char *fmt, va_list args)
-{
-        printf_spec_t ps = {
-                asprintf_str_write,
-                asprintf_wstr_write,
-                NULL
-        };
-
-        return printf_core(fmt, &ps, args);
-}
-
-int printf_length(const char *fmt, ...)
-{
-        va_list args;
-        va_start(args, fmt);
-        int ret = vprintf_length(fmt, args);
-        va_end(args);
-
-        return ret;
-}
 
 /** Allocate and print to string.
@@ -115 +84 @@
         int ret = vasprintf(strp, fmt, args);
         va_end(args);
-
         return ret;
 }

uspace/lib/c/generic/io/kio.c

@@ -131 +131 @@
 }
 
-static int kio_vprintf_str_write(const char *str, size_t size, void *data)
+static errno_t kio_vprintf_str_write(const char *str, size_t size, void *data)
 {
-        size_t wr;
-
-        wr = 0;
-        (void) kio_write(str, size, &wr);
-        return str_nlength(str, wr);
-}
-
-static int kio_vprintf_wstr_write(const char32_t *str, size_t size, void *data)
-{
-        size_t offset = 0;
-        size_t chars = 0;
-        size_t wr;
-
-        while (offset < size) {
-                char buf[STR_BOUNDS(1)];
-                size_t sz = 0;
-
-                if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK)
-                        kio_write(buf, sz, &wr);
-
-                chars++;
-                offset += sizeof(char32_t);
-        }
-
-        return chars;
+        size_t wr = 0;
+        return kio_write(str, size, &wr);
 }
 
@@ -172 +149 @@
         printf_spec_t ps = {
                 kio_vprintf_str_write,
-                kio_vprintf_wstr_write,
                 NULL
         };

uspace/lib/c/generic/io/vprintf.c

@@ -42 +42 @@
 static FIBRIL_MUTEX_INITIALIZE(printf_mutex);
 
-static int vprintf_str_write(const char *str, size_t size, void *stream)
+static errno_t vprintf_str_write(const char *str, size_t size, void *stream)
 {
-        size_t wr = fwrite(str, 1, size, (FILE *) stream);
-        return str_nlength(str, wr);
-}
+        errno_t old_errno = errno;
 
-static int vprintf_wstr_write(const char32_t *str, size_t size, void *stream)
-{
-        size_t offset = 0;
-        size_t chars = 0;
+        errno = EOK;
+        size_t written = fwrite(str, 1, size, (FILE *) stream);
 
-        while (offset < size) {
-                if (fputuc(str[chars], (FILE *) stream) <= 0)
-                        break;
+        if (errno == EOK && written != size)
+                errno = EIO;
 
-                chars++;
-                offset += sizeof(char32_t);
-        }
+        if (errno != EOK)
+                return errno;
 
-        return chars;
+        errno = old_errno;
+        return EOK;
 }
 
@@ -77 +72 @@
         printf_spec_t ps = {
                 vprintf_str_write,
-                vprintf_wstr_write,
                 stream
         };

uspace/lib/c/include/stdio.h

@@ -209 +209 @@
 };
 
-extern int vprintf_length(const char *, va_list);
-extern int printf_length(const char *, ...)
-    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern FILE *fdopen(int, const char *);
 extern int fileno(FILE *);

uspace/lib/c/meson.build

@@ -72 +72 @@
         'common/stdc/mem.c',
         'common/stdc/qsort.c',
+        'common/stdc/snprintf.c',
         'common/stdc/uchar.c',
+        'common/stdc/vsnprintf.c',
         'common/stdc/wchar.c',
         'common/str.c',
@@ -113 +115 @@
         'generic/io/logctl.c',
         'generic/io/printf.c',
-        'generic/io/snprintf.c',
         'generic/io/table.c',
         'generic/io/vprintf.c',
-        'generic/io/vsnprintf.c',
         'generic/ipc.c',
         'generic/irq.c',

uspace/lib/posix/src/stdio.c

@@ -232 +232 @@
  * @return The number of written characters.
  */
-static int _dprintf_str_write(const char *str, size_t size, void *fd)
+static errno_t _dprintf_str_write(const char *str, size_t size, void *fd)
 {
         const int fildes = *(int *) fd;
         size_t 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;
+        return vfs_write(fildes, &posix_pos[fildes], str, size, &wr);
 }
 
@@ -285 +250 @@
 {
         printf_spec_t spec = {
-                .str_write = _dprintf_str_write,
-                .wstr_write = _dprintf_wstr_write,
+                .write = _dprintf_str_write,
                 .data = &fildes
         };