Changeset c7c6afd in mainline for common/stdc/vsnprintf.c

Timestamp:

2025-04-13T23:27:44Z (4 weeks 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

File:

• common/stdc/vsnprintf.c (moved) (moved from kernel/generic/include/printf/printf_core.h ) (3 diffs)

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;
+}
 
 /** @}