Rev 954 | Rev 1010 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 954 | Rev 974 | ||
---|---|---|---|
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 | 33 | ||
33 | static char nl = '\n'; |
34 | static char nl = '\n'; |
34 | 35 | ||
35 | int puts(const char * str) |
36 | int puts(const char * str) |
36 | { |
37 | { |
37 | size_t count; |
38 | size_t count; |
38 | 39 | ||
39 | for (count = 0; str[count] != 0; count++); |
40 | for (count = 0; str[count] != 0; count++); |
40 | if (write(1, (void * ) str, count) == count) { |
41 | if (write(1, (void * ) str, count) == count) { |
41 | if (write(1, &nl, 1) == 1) |
42 | if (write(1, &nl, 1) == 1) |
42 | return 0; |
43 | return 0; |
43 | } |
44 | } |
44 | 45 | ||
45 | return EOF; |
46 | return EOF; |
46 | } |
47 | } |
47 | 48 | ||
- | 49 | /** Put count chars from buffer to stdout without adding newline |
|
- | 50 | * @param buf Buffer with size at least count bytes |
|
- | 51 | * @param count |
|
- | 52 | * @return 0 on succes, EOF on fail |
|
- | 53 | */ |
|
- | 54 | int putnchars(const char * buf, size_t count) |
|
- | 55 | { |
|
- | 56 | if (write(1, (void * ) buf, count) == count) { |
|
- | 57 | return 0; |
|
- | 58 | } |
|
- | 59 | ||
- | 60 | return EOF; |
|
- | 61 | } |
|
- | 62 | ||
- | 63 | /** Same as puts, but does not print newline at end |
|
- | 64 | * |
|
- | 65 | */ |
|
- | 66 | int putstr(const char * str) |
|
- | 67 | { |
|
- | 68 | size_t count; |
|
- | 69 | ||
- | 70 | for (count = 0; str[count] != 0; count++); |
|
- | 71 | if (write(1, (void * ) str, count) == count) { |
|
- | 72 | return 0; |
|
- | 73 | } |
|
- | 74 | ||
- | 75 | return EOF; |
|
- | 76 | } |
|
- | 77 | ||
48 | ssize_t write(int fd, const void * buf, size_t count) |
78 | ssize_t write(int fd, const void * buf, size_t count) |
49 | { |
79 | { |
50 | return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); |
80 | return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); |
51 | } |
81 | } |
- | 82 | ||
- | 83 | ||
52 | 84 |