diff --git a/CHANGELOG b/CHANGELOG index 1e7ea2a29..328f78c85 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,13 @@ Changes for U-Boot 1.0.2: ====================================================================== +* Patch by Carl Riechers, 17 Mar 2004: + Ignore '\0' characters in console input for use with telnet and + telco pads. + +* Patch by Leon Kukovec, 17 Mar 2004: + typo fix for strswab prototype #ifdef + * Patches by Thomas Viehweger, 16 Mar 2004: - show PCI clock frequency on MPC8260 systems - add FCC_PSMR_RMII flag for HiP7 processors diff --git a/CREDITS b/CREDITS index b0bd8bca8..5a06bb2c1 100644 --- a/CREDITS +++ b/CREDITS @@ -252,6 +252,10 @@ E: rof@sysgo.de D: Initial support for SSV-DNP1110, SMC91111 driver W: www.elinos.com +N: Tolunay Orkun +E: torkun@nextio.com +D: Support for Cogent CSB272 board + N: Keith Outwater E: keith_outwater@mvis.com D: Support for generic/custom MPC860T boards (GEN860T, GEN860T_SC) diff --git a/common/main.c b/common/main.c index 817c1b461..156e4bc3d 100644 --- a/common/main.c +++ b/common/main.c @@ -574,6 +574,9 @@ int readline (const char *const prompt) puts ("\r\n"); return (p - console_buffer); + case '\0': /* nul */ + continue; + case 0x03: /* ^C - break */ console_buffer[0] = '\0'; /* discard input */ return (-1); diff --git a/include/linux/string.h b/include/linux/string.h index 403ae982b..1a45fd321 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -59,7 +59,7 @@ extern __kernel_size_t strnlen(const char *,__kernel_size_t); #ifndef __HAVE_ARCH_STRDUP extern char * strdup(const char *); #endif -#ifdef __HAVE_ARCH_STRSWAB +#ifndef __HAVE_ARCH_STRSWAB extern char * strswab(const char *); #endif