Subversion Repositories HelenOS

Rev

Rev 4347 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4347 Rev 4348
Line 41... Line 41...
41 
#include <typedefs.h>
 41 
#include <typedefs.h>
42 
#include <string.h>
 42 
#include <string.h>
43 
 
 43 
 
44 
SPINLOCK_INITIALIZE(printf_lock);  /**< vprintf spinlock */
 44 
SPINLOCK_INITIALIZE(printf_lock);  /**< vprintf spinlock */
45 
 
 45 
 
46 
static int vprintf_write_utf8(const char *str, size_t size, void *data)
 46 
static int vprintf_str_write(const char *str, size_t size, void *data)
47 
{
 47 
{
48 
    index_t index = 0;
 48 
    size_t offset = 0;
49 
    index_t chars = 0;
 49 
    count_t chars = 0;
50 
   
 50 
   
51 
    while (index < size) {
 51 
    while (offset < size) {
52 
        putchar(utf8_decode(str, &index, size - 1));
 52 
        putchar(str_decode(str, &offset, size));
53 
        index++;
 - 
 
54 
        chars++;
 53 
        chars++;
55 
    }
 54 
    }
56 
   
 55 
   
57 
    return chars;
 56 
    return chars;
58 
}
 57 
}
59 
 
 58 
 
60 
static int vprintf_write_utf32(const wchar_t *str, size_t size, void *data)
 59 
static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data)
61 
{
 60 
{
62 
    index_t index = 0;
 61 
    size_t offset = 0;
- 
 
 62 
    count_t chars = 0;
63 
   
 63 
   
64 
    while (index < (size / sizeof(wchar_t))) {
 64 
    while (offset < size) {
65 
        putchar(str[index]);
 65 
        putchar(str[chars]);
66 
        index++;
 66 
        chars++;
- 
 
 67 
        offset += sizeof(wchar_t);
67 
    }
 68 
    }
68 
   
 69 
   
69 
    return index;
 70 
    return chars;
70 
}
 71 
}
71 
 
 72 
 
72 
int puts(const char *str)
 73 
int puts(const char *str)
73 
{
 74 
{
74 
    index_t index = 0;
 75 
    size_t offset = 0;
75 
    index_t chars = 0;
 76 
    count_t chars = 0;
76 
    wchar_t uc;
 77 
    wchar_t uc;
77 
   
 78 
   
78 
    while ((uc = utf8_decode(str, &index, UTF8_NO_LIMIT)) != 0) {
 79 
    while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
79 
        putchar(uc);
 80 
        putchar(uc);
80 
        index++;
 - 
 
81 
        chars++;
 81 
        chars++;
82 
    }
 82 
    }
83 
   
 83 
   
84 
    return chars;
 84 
    return chars;
85 
}
 85 
}
86 
 
 86 
 
87 
int vprintf(const char *fmt, va_list ap)
 87 
int vprintf(const char *fmt, va_list ap)
88 
{
 88 
{
89 
    printf_spec_t ps = {
 89 
    printf_spec_t ps = {
90 
        vprintf_write_utf8,
 90 
        vprintf_str_write,
91 
        vprintf_write_utf32,
 91 
        vprintf_wstr_write,
92 
        NULL
 92 
        NULL
93 
    };
 93 
    };
94 
   
 94 
   
95 
    ipl_t ipl = interrupts_disable();
 95 
    ipl_t ipl = interrupts_disable();
96 
    spinlock_lock(&printf_lock);
 96 
    spinlock_lock(&printf_lock);