From 8fe1e8fd41ba872760f3c9241167488e4a506950 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 14 Oct 2011 08:56:22 +0200 Subject: [PATCH] console: fix return values of puts functions Signed-off-by: Sascha Hauer --- common/console.c | 14 ++++++++++---- include/stdio.h | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/common/console.c b/common/console.c index 06e9c29e8..e82934b86 100644 --- a/common/console.c +++ b/common/console.c @@ -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; diff --git a/include/stdio.h b/include/stdio.h index a0d81d3b7..bfaeb6c07 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -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)