dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

console: Report an error when output buffer is exhausted

Browse Source 
If the console output buffer is exhausted, characters are silently dropped
from the end. Detect this condition and report an error when reading back
the characters.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2021-05-08 06:59:56 -06:00
committed by Tom Rini
parent 24e1e8841c
commit c1a2bb4f83
4 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/console.c
View File

@@ -95,16 +95,22 @@ static void console_record_putc(const char c)
{
if (!(gd->flags & GD_FLG_RECORD))
return;
if (gd->console_out.start)
membuff_putbyte((struct membuff *)&gd->console_out, c);
if (gd->console_out.start &&
!membuff_putbyte((struct membuff *)&gd->console_out, c))
gd->flags |= GD_FLG_RECORD_OVF;
}
static void console_record_puts(const char *s)
{
if (!(gd->flags & GD_FLG_RECORD))
return;
if (gd->console_out.start)
membuff_put((struct membuff *)&gd->console_out, s, strlen(s));
if (gd->console_out.start) {
int len = strlen(s);
if (membuff_put((struct membuff *)&gd->console_out, s, len) !=
len)
gd->flags |= GD_FLG_RECORD_OVF;
}
}
static int console_record_getc(void)
@@ -742,6 +748,7 @@ void console_record_reset(void)
{
membuff_purge((struct membuff *)&gd->console_out);
membuff_purge((struct membuff *)&gd->console_in);
gd->flags &= ~GD_FLG_RECORD_OVF;
}
int console_record_reset_enable(void)
@@ -754,6 +761,9 @@ int console_record_reset_enable(void)
int console_record_readline(char *str, int maxlen)
{
if (gd->flags & GD_FLG_RECORD_OVF)
return -ENOSPC;
return membuff_readline((struct membuff *)&gd->console_out, str,
maxlen, ' ');
}