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