From 8fe1e8fd41ba872760f3c9241167488e4a506950 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 14 Oct 2011 08:56:22 +0200 Subject: console: fix return values of puts functions Signed-off-by: Sascha Hauer --- common/console.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'common/console.c') diff --git a/common/console.c b/common/console.c index 06e9c29e8c..e82934b865 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; -- cgit v1.2.3