Changeset 2595dab in mainline for uspace/lib/libc/generic/io/vprintf.c

Timestamp:

2009-06-03T19:26:28Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d00ae4c

Parents:

ca3ba3a

Message:

I/O subsystem overhaul:

• add more POSIX-like file and stream functions (with real functionality of stdin, stdout, stderr)
• cleanup console access methods (now generic to any console-like device)
• remove unsafe stream functions
• add special open_node(), fd_node(), fd_phone() (file) and fopen_node(), fnode(), fphone() (stream) functions for HelenOS-specific I/O operations

File:

• uspace/lib/libc/generic/io/vprintf.c (modified) (3 diffs)

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

@@ -39 +39 @@
 #include <futex.h>
 #include <async.h>
-#include <console.h>
+#include <string.h>
 
 static atomic_t printf_futex = FUTEX_INITIALIZER;
 
-static int vprintf_str_write(const char *str, size_t size, void *data)
+static int 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);
+}
+
+static int vprintf_wstr_write(const wchar_t *str, size_t size, void *stream)
 {
         size_t offset = 0;
-        size_t prev;
-        count_t chars = 0;
+        size_t chars = 0;
         
         while (offset < size) {
-                prev = offset;
-                str_decode(str, &offset, size);
-                console_write(str + prev, offset - prev);
-                chars++;
-        }
-        
-        return chars;
-}
-
-static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data)
-{
-        size_t offset = 0;
-        size_t boff;
-        count_t chars = 0;
-        char buf[4];
-        
-        while (offset < size) {
-                boff = 0;
-                chr_encode(str[chars], buf, &boff, 4);
-                console_write(buf, boff);
+                if (fputc(str[chars], (FILE *) stream) <= 0)
+                        break;
+                
                 chars++;
                 offset += sizeof(wchar_t);
@@ -77 +65 @@
 }
 
-
 /** Print formatted text.
- * @param fmt   format string
- * @param ap    format parameters
+ *
+ * @param stream Output stream
+ * @param fmt    Format string
+ * @param ap     Format parameters
+ *
  * \see For more details about format string see printf_core.
+ *
  */
-int vprintf(const char *fmt, va_list ap)
+int vfprintf(FILE *stream, const char *fmt, va_list ap)
 {
         struct printf_spec ps = {
                 vprintf_str_write,
                 vprintf_wstr_write,
-                 NULL
+                stream
         };
+        
         /*
          * Prevent other threads to execute printf_core()
          */
         futex_down(&printf_futex);
+        
         /*
          * Prevent other pseudo threads of the same thread
@@ -99 +92 @@
          */
         async_serialize_start();
+        
         int ret = printf_core(fmt, &ps, ap);
+        
         async_serialize_end();
         futex_up(&printf_futex);
+        
         return ret;
+}
+
+/** Print formatted text to stdout.
+ *
+ * @param file Output stream
+ * @param fmt  Format string
+ * @param ap   Format parameters
+ *
+ * \see For more details about format string see printf_core.
+ *
+ */
+int vprintf(const char *fmt, va_list ap)
+{
+        return vfprintf(stdout, fmt, ap);
 }