sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

console: fix return values of puts functions 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-10-14 08:56:22 +02:00
parent 84b222987e
commit 8fe1e8fd41
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/console.c
View File

@ -292,24 +292,30 @@ int fputc(int fd, char c)
}
EXPORT_SYMBOL(fputc);
void console_puts(unsigned int ch, const char *str)
int console_puts(unsigned int ch, const char *str)
{
const char *s = str;
int n = 0;
while (*s) {
if (*s == '\n')
if (*s == '\n') {
console_putc(ch, '\r');
n++;
}
console_putc(ch, *s);
n++;
s++;
}
return n;
}
EXPORT_SYMBOL(console_puts);
int fputs(int fd, const char *s)
{
if (fd == 1)
puts(s);
return puts(s);
else if (fd == 2)
eputs(s);
return eputs(s);
else
return write(fd, s, strlen(s));
return 0;

6
include/stdio.h
View File

@ -17,12 +17,12 @@ int tstc(void);
/* stdout */
void console_putc(unsigned int ch, const char c);
int getc(void);
void console_puts(unsigned int ch, const char *s);
int console_puts(unsigned int ch, const char *s);
void console_flush(void);
static inline void puts(const char *s)
static inline int puts(const char *s)
{
console_puts(CONSOLE_STDOUT, s);
return console_puts(CONSOLE_STDOUT, s);
}
static inline void putchar(char c)