Rev 4347 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4347 | Rev 4348 | ||
---|---|---|---|
Line 34... | Line 34... | ||
34 | 34 | ||
35 | #include <libc.h> |
35 | #include <libc.h> |
36 | #include <unistd.h> |
36 | #include <unistd.h> |
37 | #include <stdio.h> |
37 | #include <stdio.h> |
38 | #include <io/io.h> |
38 | #include <io/io.h> |
- | 39 | #include <string.h> |
|
- | 40 | #include <errno.h> |
|
- | 41 | #include <console.h> |
|
39 | 42 | ||
40 | const static char nl = '\n'; |
43 | const static char nl = '\n'; |
41 | 44 | ||
42 | int puts(const char *str) |
45 | int puts(const char *str) |
43 | { |
46 | { |
Line 45... | Line 48... | ||
45 | 48 | ||
46 | if (str == NULL) |
49 | if (str == NULL) |
47 | return putnchars("(NULL)", 6); |
50 | return putnchars("(NULL)", 6); |
48 | 51 | ||
49 | for (count = 0; str[count] != 0; count++); |
52 | for (count = 0; str[count] != 0; count++); |
- | 53 | ||
50 | if (write_stdout((void *) str, count) == count) { |
54 | if (console_write((void *) str, count) == count) { |
51 | if (write_stdout(&nl, 1) == 1) |
55 | if (console_write(&nl, 1) == 1) |
52 | return 0; |
56 | return 0; |
53 | } |
57 | } |
54 | 58 | ||
55 | return EOF; |
59 | return EOF; |
56 | } |
60 | } |
Line 60... | Line 64... | ||
60 | * @param count |
64 | * @param count |
61 | * @return 0 on succes, EOF on fail |
65 | * @return 0 on succes, EOF on fail |
62 | */ |
66 | */ |
63 | int putnchars(const char *buf, size_t count) |
67 | int putnchars(const char *buf, size_t count) |
64 | { |
68 | { |
65 | if (write_stdout((void *) buf, count) == count) |
69 | if (console_write((void *) buf, count) == count) |
66 | return 0; |
70 | return 0; |
67 | 71 | ||
68 | return EOF; |
72 | return EOF; |
69 | } |
73 | } |
70 | 74 | ||
Line 77... | Line 81... | ||
77 | 81 | ||
78 | if (str == NULL) |
82 | if (str == NULL) |
79 | return putnchars("(NULL)", 6); |
83 | return putnchars("(NULL)", 6); |
80 | 84 | ||
81 | for (count = 0; str[count] != 0; count++); |
85 | for (count = 0; str[count] != 0; count++); |
82 | if (write_stdout((void *) str, count) == count) |
86 | if (console_write((void *) str, count) == count) |
83 | return 0; |
87 | return 0; |
84 | 88 | ||
85 | return EOF; |
89 | return EOF; |
86 | } |
90 | } |
87 | 91 | ||
88 | int putchar(int c) |
92 | int putchar(int c) |
89 | { |
93 | { |
- | 94 | char buf[STR_BOUNDS(1)]; |
|
90 | unsigned char ch = c; |
95 | size_t offs; |
- | 96 | ||
- | 97 | offs = 0; |
|
- | 98 | if (chr_encode(c, buf, &offs, STR_BOUNDS(1)) != EOK) |
|
- | 99 | return EOF; |
|
- | 100 | ||
91 | if (write_stdout((void *) &ch, 1) == 1) |
101 | if (console_write((void *) buf, offs) == offs) |
92 | return c; |
102 | return c; |
93 | 103 | ||
94 | return EOF; |
104 | return EOF; |
95 | } |
105 | } |
96 | 106 | ||
97 | int getchar(void) |
107 | int getchar(void) |
98 | { |
108 | { |
99 | unsigned char c; |
109 | unsigned char c; |
100 | 110 | ||
101 | flush_stdout(); |
111 | console_flush(); |
102 | if (read_stdin((void *) &c, 1) == 1) |
112 | if (read_stdin((void *) &c, 1) == 1) |
103 | return c; |
113 | return c; |
104 | 114 | ||
105 | return EOF; |
115 | return EOF; |
106 | } |
116 | } |
107 | 117 | ||
108 | int fflush(FILE *f) |
118 | int fflush(FILE *f) |
109 | { |
119 | { |
- | 120 | /* Dummy implementation */ |
|
110 | (void) f; |
121 | (void) f; |
111 | return flush_stdout(); |
122 | console_flush(); |
- | 123 | return 0; |
|
112 | } |
124 | } |
113 | 125 | ||
114 | /** @} |
126 | /** @} |
115 | */ |
127 | */ |