Changeset 163e34c in mainline for common

Timestamp:

2025-04-13T19:33:48Z (3 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

f5e1692

Parents:

97f6b71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-13 18:56:51)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-13 19:33:48)

Message:

Actually convert the printf outputs everywhere

Location:

common

Files:

• include/printf_core.h (modified) (1 diff)
• printf/printf_core.c (modified) (2 diffs)
• stdc/snprintf.c (moved) (moved from uspace/lib/c/generic/io/snprintf.c )
• stdc/vsnprintf.c (moved) (moved from kernel/generic/include/printf/printf_core.h ) (3 diffs)

common/include/printf_core.h

@@ -36 +36 @@
 #define _LIBC_PRINTF_CORE_H_
 
+#include <errno.h>
+#include <stdarg.h>
 #include <stddef.h>
-#include <stdarg.h>
 #include <uchar.h>
 
 /** Structure for specifying output methods for different printf clones. */
 typedef struct {
-        /* String output function, returns number of printed characters or EOF */
-        int (*str_write)(const char *, size_t, void *);
-
-        /* Wide string output function, returns number of printed characters or EOF */
-        int (*wstr_write)(const char32_t *, size_t, void *);
+        /*
+         * String output function, returns EOK on success.
+         * Only returns an error when an irrecoverable failure occurs and
+         * the string cannot be fully output.
+         */
+        errno_t (*write)(const char *, size_t, void *);
 
         /* User data - output stream specification, state, locks, etc. */

common/printf/printf_core.c

@@ -201 +201 @@
     size_t *written_bytes)
 {
-        int written = ps->str_write(buf, n, ps->data);
-        if (written < 0)
-                return EIO;
+        errno_t rc = ps->write(buf, n, ps->data);
+        if (rc != EOK)
+                return rc;
+
         _saturating_add(written_bytes, n);
         return EOK;
-
-        #if 0
-        errno_t rc = ps->write(buf, &n, ps->data);
-        _saturating_add(written_bytes, n);
-        return rc;
-        #endif
 }
 
@@ -1466 +1461 @@
 
                 rc = _format_number(number, width, precision, base, flags, ps, &counter);
-                if (rc != EOK)
-                        continue;
         }
 

common/stdc/vsnprintf.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2025 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup kernel_generic
+/** @addtogroup libc
  * @{
  */
@@ -33 +34 @@
  */
 
-#ifndef KERN_PRINTF_CORE_H_
-#define KERN_PRINTF_CORE_H_
+#include <errno.h>
+#include <macros.h>
+#include <printf_core.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <str.h>
 
-#include <stdarg.h>
-#include <stddef.h>
-#include <uchar.h>
+typedef struct {
+        char *dst;      /* Destination */
+        size_t left;
+} vsnprintf_data_t;
 
-/** Structure for specifying output methods for different printf clones. */
-typedef struct {
-        /* String output function, returns number of printed characters or EOF */
-        int (*str_write)(const char *, size_t, void *);
+static int vsnprintf_str_write(const char *str, size_t size, void *data)
+{
+        vsnprintf_data_t *d = data;
+        size_t left = min(size, d->left);
+        if (left > 0) {
+                memcpy(d->dst, str, left);
+                d->dst += left;
+                d->left -= left;
+        }
+        return EOK;
+}
 
-        /* Wide string output function, returns number of printed characters or EOF */
-        int (*wstr_write)(const char32_t *, size_t, void *);
+int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
+{
+        vsnprintf_data_t data = {
+                .dst = str,
+                .left = size ? size - 1 : 0,
+        };
 
-        /* User data - output stream specification, state, locks, etc. */
-        void *data;
-} printf_spec_t;
+        printf_spec_t ps = {
+                vsnprintf_str_write,
+                &data
+        };
 
-extern int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
+        int written = printf_core(fmt, &ps, ap);
+        if (written < 0)
+                return written;
 
-#endif
+        /* Write the terminating NUL character. */
+        if (size > 0)
+                data.dst[0] = 0;
+
+        return written;
+}
 
 /** @}