Rev 4296 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4296 | Rev 4420 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (c) 2005 Martin Decky |
2 | * Copyright (c) 2005 Martin Decky |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | /** @addtogroup libc |
29 | /** @addtogroup libc |
30 | * @{ |
30 | * @{ |
31 | */ |
31 | */ |
32 | /** @file |
32 | /** @file |
33 | */ |
33 | */ |
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> |
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 | { |
46 | size_t count; |
47 | size_t count; |
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 | } |
59 | 61 | ||
60 | /** Put count chars from buffer to stdout without adding newline |
62 | /** Put count chars from buffer to stdout without adding newline |
61 | * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
63 | * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
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 | ||
73 | /** Same as puts, but does not print newline at end |
75 | /** Same as puts, but does not print newline at end |
74 | * |
76 | * |
75 | */ |
77 | */ |
76 | int putstr(const char *str) |
78 | int putstr(const char *str) |
77 | { |
79 | { |
78 | size_t count; |
80 | size_t count; |
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 | ||
90 | int putchar(int c) |
92 | int putchar(int c) |
91 | { |
93 | { |
92 | char buf[STR_BOUNDS(1)]; |
94 | char buf[STR_BOUNDS(1)]; |
93 | size_t offs; |
95 | size_t offs; |
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 | */ |
124 | 128 |