Rev 1173 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1173 | Rev 1363 | ||
---|---|---|---|
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 | #include <libc.h> |
29 | #include <libc.h> |
30 | #include <unistd.h> |
30 | #include <unistd.h> |
31 | #include <stdio.h> |
31 | #include <stdio.h> |
32 | #include <io/io.h> |
32 | #include <io/io.h> |
33 | 33 | ||
34 | static char nl = '\n'; |
34 | static char nl = '\n'; |
35 | 35 | ||
36 | int puts(const char * str) |
36 | int puts(const char * str) |
37 | { |
37 | { |
38 | size_t count; |
38 | size_t count; |
39 | 39 | ||
40 | if (str == NULL) { |
40 | if (str == NULL) { |
41 | return putnchars("(NULL)",6 ); |
41 | return putnchars("(NULL)",6 ); |
42 | } |
42 | } |
43 | 43 | ||
44 | for (count = 0; str[count] != 0; count++); |
44 | for (count = 0; str[count] != 0; count++); |
45 | if (write(1, (void * ) str, count) == count) { |
45 | if (write(1, (void * ) str, count) == count) { |
46 | if (write(1, &nl, 1) == 1) |
46 | if (write(1, &nl, 1) == 1) |
47 | return 0; |
47 | return 0; |
48 | } |
48 | } |
49 | 49 | ||
50 | return EOF; |
50 | return EOF; |
51 | } |
51 | } |
52 | 52 | ||
53 | /** Put count chars from buffer to stdout without adding newline |
53 | /** Put count chars from buffer to stdout without adding newline |
54 | * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
54 | * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
55 | * @param count |
55 | * @param count |
56 | * @return 0 on succes, EOF on fail |
56 | * @return 0 on succes, EOF on fail |
57 | */ |
57 | */ |
58 | int putnchars(const char * buf, size_t count) |
58 | int putnchars(const char * buf, size_t count) |
59 | { |
59 | { |
60 | if (write(1, (void * ) buf, count) == count) { |
60 | if (write(1, (void * ) buf, count) == count) { |
61 | return 0; |
61 | return 0; |
62 | } |
62 | } |
63 | 63 | ||
64 | return EOF; |
64 | return EOF; |
65 | } |
65 | } |
66 | 66 | ||
67 | /** Same as puts, but does not print newline at end |
67 | /** Same as puts, but does not print newline at end |
68 | * |
68 | * |
69 | */ |
69 | */ |
70 | int putstr(const char * str) |
70 | int putstr(const char * str) |
71 | { |
71 | { |
72 | size_t count; |
72 | size_t count; |
73 | 73 | ||
74 | if (str == NULL) { |
74 | if (str == NULL) { |
75 | return putnchars("(NULL)",6 ); |
75 | return putnchars("(NULL)",6 ); |
76 | } |
76 | } |
77 | 77 | ||
78 | for (count = 0; str[count] != 0; count++); |
78 | for (count = 0; str[count] != 0; count++); |
79 | if (write(1, (void * ) str, count) == count) { |
79 | if (write(1, (void * ) str, count) == count) { |
80 | return 0; |
80 | return 0; |
81 | } |
81 | } |
82 | 82 | ||
83 | return EOF; |
83 | return EOF; |
84 | } |
84 | } |
85 | 85 | ||
86 | int putchar(int c) |
86 | int putchar(int c) |
87 | { |
87 | { |
88 | unsigned char ch = c; |
88 | unsigned char ch = c; |
89 | if (write(1, (void *)&ch , 1) == 1) { |
89 | if (write(1, (void *)&ch , 1) == 1) { |
90 | return c; |
90 | return c; |
91 | } |
91 | } |
92 | 92 | ||
93 | return EOF; |
93 | return EOF; |
94 | } |
94 | } |
95 | 95 | /* |
|
96 | ssize_t write(int fd, const void * buf, size_t count) |
96 | ssize_t write(int fd, const void * buf, size_t count) |
97 | { |
97 | { |
98 | return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); |
98 | return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); |
- | 99 | }*/ |
|
- | 100 | ||
99 | } |
101 | |
100 | 102 | ||
101 | 103 | ||
102 | 104 |