diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-13 02:25:32 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-13 02:25:32 +0200 | 
| commit | c72d9c528517e629e146ca9ce101a4888c45fac8 (patch) | |
| tree | 64a849b5b6e252d5eef10081658042348b4ccc47 /common/main.c | |
| parent | 7213859d112b434b1a37049e14d8e963199dca84 (diff) | |
| parent | d8f961bbdaeef4dc1af7a01e297bf2d7e25ae227 (diff) | |
| download | olio-uboot-2014.01-c72d9c528517e629e146ca9ce101a4888c45fac8.tar.xz olio-uboot-2014.01-c72d9c528517e629e146ca9ce101a4888c45fac8.zip | |
Merge with /home/sr/git/u-boot/denx
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/common/main.c b/common/main.c index 3788bd5e4..13d12a430 100644 --- a/common/main.c +++ b/common/main.c @@ -937,6 +937,7 @@ int readline (const char *const prompt)  #ifdef CONFIG_CMDLINE_EDITING  	char *p = console_buffer;  	unsigned int len=MAX_CMDBUF_SIZE; +	int rc;  	static int initted = 0;  	if (!initted) { @@ -946,8 +947,8 @@ int readline (const char *const prompt)  	puts (prompt); -	cread_line(p, &len); -	return len; +	rc = cread_line(p, &len); +	return rc < 0 ? rc : len;  #else  	char   *p = console_buffer;  	int	n = 0;				/* buffer index		*/ |