Rev 2131 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2131 | Rev 2307 | ||
---|---|---|---|
Line 35... | Line 35... | ||
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 | 39 | ||
40 | static char nl = '\n'; |
40 | const static char nl = '\n'; |
41 | 41 | ||
42 | int puts(const char * str) |
42 | int puts(const char *str) |
43 | { |
43 | { |
44 | size_t count; |
44 | size_t count; |
45 | 45 | ||
46 | if (str == NULL) { |
46 | if (str == NULL) |
47 | return putnchars("(NULL)",6 ); |
47 | return putnchars("(NULL)", 6); |
48 | } |
- | |
49 | 48 | ||
50 | for (count = 0; str[count] != 0; count++); |
49 | for (count = 0; str[count] != 0; count++); |
51 | if (write(1, (void * ) str, count) == count) { |
50 | if (write(1, (void *) str, count) == count) { |
52 | if (write(1, &nl, 1) == 1) |
51 | if (write(1, &nl, 1) == 1) |
53 | return 0; |
52 | return 0; |
54 | } |
53 | } |
55 | 54 | ||
56 | return EOF; |
55 | return EOF; |
Line 59... | Line 58... | ||
59 | /** Put count chars from buffer to stdout without adding newline |
58 | /** Put count chars from buffer to stdout without adding newline |
60 | * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
59 | * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
61 | * @param count |
60 | * @param count |
62 | * @return 0 on succes, EOF on fail |
61 | * @return 0 on succes, EOF on fail |
63 | */ |
62 | */ |
64 | int putnchars(const char * buf, size_t count) |
63 | int putnchars(const char *buf, size_t count) |
65 | { |
64 | { |
66 | if (write(1, (void * ) buf, count) == count) { |
65 | if (write(1, (void *) buf, count) == count) |
67 | return 0; |
66 | return 0; |
68 | } |
- | |
69 | 67 | ||
70 | return EOF; |
68 | return EOF; |
71 | } |
69 | } |
72 | 70 | ||
73 | /** Same as puts, but does not print newline at end |
71 | /** Same as puts, but does not print newline at end |
74 | * |
72 | * |
75 | */ |
73 | */ |
76 | int putstr(const char * str) |
74 | int putstr(const char *str) |
77 | { |
75 | { |
78 | size_t count; |
76 | size_t count; |
79 | 77 | ||
80 | if (str == NULL) { |
78 | if (str == NULL) |
81 | return putnchars("(NULL)",6 ); |
79 | return putnchars("(NULL)", 6); |
82 | } |
- | |
83 | 80 | ||
84 | for (count = 0; str[count] != 0; count++); |
81 | for (count = 0; str[count] != 0; count++); |
85 | if (write(1, (void * ) str, count) == count) { |
82 | if (write(1, (void *) str, count) == count) |
86 | return 0; |
83 | return 0; |
87 | } |
- | |
88 | 84 | ||
89 | return EOF; |
85 | return EOF; |
90 | } |
86 | } |
91 | 87 | ||
92 | int putchar(int c) |
88 | int putchar(int c) |
93 | { |
89 | { |
94 | unsigned char ch = c; |
90 | unsigned char ch = c; |
95 | if (write(1, (void *)&ch , 1) == 1) { |
91 | if (write(1, (void *) &ch, 1) == 1) |
96 | return c; |
92 | return c; |
97 | } |
- | |
98 | 93 | ||
99 | return EOF; |
94 | return EOF; |
100 | } |
95 | } |
101 | 96 | ||
102 | int getchar(void) |
97 | int getchar(void) |
103 | { |
98 | { |
104 | unsigned char c; |
99 | unsigned char c; |
105 | if (read(0, (void *)&c , 1) == 1) { |
100 | if (read(0, (void *) &c, 1) == 1) |
106 | return c; |
101 | return c; |
107 | } |
- | |
108 | 102 | ||
109 | return EOF; |
103 | return EOF; |
110 | } |
104 | } |
111 | 105 | ||
112 | /** @} |
106 | /** @} |