diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-01 19:07:57 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-01 19:07:57 +0000 |
commit | 6a4e8b32b36f90188dd0a1a961c99b2bc825b627 (patch) | |
tree | 058c4031d3edf80d524112e76c6da2bdc0be8e5c /nuttx | |
parent | 47fa99c4a804956d537a3570587c59ecfb589717 (diff) | |
download | px4-firmware-6a4e8b32b36f90188dd0a1a961c99b2bc825b627.tar.gz px4-firmware-6a4e8b32b36f90188dd0a1a961c99b2bc825b627.tar.bz2 px4-firmware-6a4e8b32b36f90188dd0a1a961c99b2bc825b627.zip |
Move lib/stdio/lib_fgets.c to apps/system/readline; simplify fgets(); use readline instead of fgets in NSH
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4356 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx')
44 files changed, 170 insertions, 280 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index dbe87bb88..bd73f2899 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2425,3 +2425,9 @@ * lib/dirent: Moved readdir_r() and telldir() from lib/misc to this new directory where they belong. * lib/termios. Implemented tcsetattr() and tcgetattr(). + * lib/stdio/lib_fgets.c: The old fgets includes some terminal related + functionality: It handles VT-100 commands, includes a command line editor + and echo characters back to the terminal. This old, overloaded fgets() + was renamed readline() and moved to apps/system/readline. The version + of fgets() in lib/stdio was them simplified and stripped down so that it + *only* gets a string -- as its description implies. diff --git a/nuttx/TODO b/nuttx/TODO index 09b886adc..1bf143729 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -1,4 +1,4 @@ -NuttX TODO List (Last updated January 17, 2012) +NuttX TODO List (Last updated February 1, 2012) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This file summarizes known NuttX bugs, limitations, inconsistencies with @@ -15,7 +15,7 @@ nuttx/ (5) Binary loaders (binfmt/) (16) Network (net/, drivers/net) (2) USB (drivers/usbdev, drivers/usbhost) - (9) Libraries (lib/) + (8) Libraries (lib/) (10) File system/Generic drivers (fs/, drivers/) (1) Graphics subystem (graphics/) (1) Pascal add-on (pcode/) @@ -46,6 +46,7 @@ apps/ (5) Network Utilities (apps/netutils/) (5) NuttShell (NSH) (apps/nshlib) + (1) System libraries apps/system (apps/system) (5) Other Applications & Tests (apps/examples/) o Task/Scheduler (sched/) @@ -462,15 +463,6 @@ o Libraries (lib/) Status: Open Priority: Medium - Title: FGETS IMPLEMENTATION - Description: fgets implementation does not use C-buffered I/O, but rather - talks to serial driver directly via read(). It includes VT-100 - specific editting commands. This gets should be renamed readline() - and a more generic fgets() should be implemented. - Status: Open - Priority: Low (unless you are using mixed C-buffered I/O with fgets and - fgetc, for example). - Title: TERMIOS Description: Need some minimal termios support... at a minimum, enough to switch between raw and "normal" modes to support behavior like @@ -1583,8 +1575,20 @@ o NuttShell (NSH) (apps/nshlib) Status: Open Priority: Low (enhancement) +o System libraries apps/system (apps/system) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + Title: READLINE IMPLEMENTATION + Description: readline implementation does not use C-buffered I/O, but rather + talks to serial driver directly via read(). It includes VT-100 + specific editting commands. A more generic readline() should be + implemented. + Status: Open + Priority: Low (unless you are using mixed C-buffered I/O with readline and + fgetc, for example). + o Other Applications & Tests (apps/examples/) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Title: EXAMPLES/PIPE ON CYGWIN Description: The redirection test (part of examples/pipe) terminates diff --git a/nuttx/configs/avr32dev1/nsh/appconfig b/nuttx/configs/avr32dev1/nsh/appconfig index bbfb4a146..5933740d4 100644 --- a/nuttx/configs/avr32dev1/nsh/appconfig +++ b/nuttx/configs/avr32dev1/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/avr32dev1/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/c5471evm/nsh/appconfig b/nuttx/configs/c5471evm/nsh/appconfig index fa3a2c2ad..c3dade075 100644 --- a/nuttx/configs/c5471evm/nsh/appconfig +++ b/nuttx/configs/c5471evm/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/c5471evm/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/ea3131/nsh/appconfig b/nuttx/configs/ea3131/nsh/appconfig index e73b23898..abfba2c45 100644 --- a/nuttx/configs/ea3131/nsh/appconfig +++ b/nuttx/configs/ea3131/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/ea3131/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/ea3131/pgnsh/appconfig b/nuttx/configs/ea3131/pgnsh/appconfig index 0f44c4539..c8cb5bcb2 100644 --- a/nuttx/configs/ea3131/pgnsh/appconfig +++ b/nuttx/configs/ea3131/pgnsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/ea3131/pgnsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/eagle100/nsh/appconfig b/nuttx/configs/eagle100/nsh/appconfig index 43be4b653..20f9e8f82 100644 --- a/nuttx/configs/eagle100/nsh/appconfig +++ b/nuttx/configs/eagle100/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/eagle100/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/ez80f910200zco/nsh/appconfig b/nuttx/configs/ez80f910200zco/nsh/appconfig index 7cc90d549..1a6972c05 100644 --- a/nuttx/configs/ez80f910200zco/nsh/appconfig +++ b/nuttx/configs/ez80f910200zco/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/ez80f910200zco/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/hymini-stm32v/nsh/appconfig b/nuttx/configs/hymini-stm32v/nsh/appconfig index 785f83bd8..f15695797 100644 --- a/nuttx/configs/hymini-stm32v/nsh/appconfig +++ b/nuttx/configs/hymini-stm32v/nsh/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/hymini-stm32v/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -37,5 +37,6 @@ CONFIGURED_APPS += examples/nsh +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/hymini-stm32v/nsh2/appconfig b/nuttx/configs/hymini-stm32v/nsh2/appconfig index 4e44cf6a3..78f3e76c5 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/appconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/hymini-stm32v/nsh2/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH application library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # The NX and NXHELLO examples configured as an NX built-in commands diff --git a/nuttx/configs/lm3s6432-s2e/nsh/appconfig b/nuttx/configs/lm3s6432-s2e/nsh/appconfig index cc0ede8be..7d52c91a6 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/appconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/lm3s6432-s2e/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/lm3s6965-ek/nsh/appconfig b/nuttx/configs/lm3s6965-ek/nsh/appconfig index 507d2eaa3..4dbbc3bb7 100644 --- a/nuttx/configs/lm3s6965-ek/nsh/appconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/lm3s6965-ek/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/lm3s8962-ek/nsh/appconfig b/nuttx/configs/lm3s8962-ek/nsh/appconfig index 013899a9f..5268df239 100644 --- a/nuttx/configs/lm3s8962-ek/nsh/appconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/lm3s8962-ek/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,7 +39,8 @@ CONFIGURED_APPS += examples/nsh # NSH library -CONFIGURED_APPS += nshlib +CONFIGURED_APPS += system/readline +CONFIGURED_APPS += nshlibO # Networking support diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig index 1f1775eef..b37487fd0 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/lpcxpresso-lpc1768/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/mbed/nsh/appconfig b/nuttx/configs/mbed/nsh/appconfig index 5deb34150..9035f8e43 100644 --- a/nuttx/configs/mbed/nsh/appconfig +++ b/nuttx/configs/mbed/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/mbed/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/mcu123-lpc214x/nsh/appconfig b/nuttx/configs/mcu123-lpc214x/nsh/appconfig index e27ab3fc9..f8e2d5165 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/appconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/mcu123-lpc214x/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/ntosd-dm320/nsh/appconfig b/nuttx/configs/ntosd-dm320/nsh/appconfig index bd93bee6c..2c1a116c3 100644 --- a/nuttx/configs/ntosd-dm320/nsh/appconfig +++ b/nuttx/configs/ntosd-dm320/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/ntosd-dm320/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/nucleus2g/nsh/appconfig b/nuttx/configs/nucleus2g/nsh/appconfig index 5b622236d..ae83b858b 100644 --- a/nuttx/configs/nucleus2g/nsh/appconfig +++ b/nuttx/configs/nucleus2g/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/nucleus2g/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig index e4dca4137..e20ef9464 100644 --- a/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig +++ b/nuttx/configs/olimex-lpc1766stk/ftpc/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/olimex-lpc1766stk/ftpc/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -43,6 +43,7 @@ CONFIGURED_APPS += examples/ftpc # NSH and FTPC libraries +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib CONFIGURED_APPS += netutils/ftpc diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig index e9af6d3b2..e1a7d522c 100644 --- a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/olimex-lpc1766stk/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/olimex-lpc2378/nsh/appconfig b/nuttx/configs/olimex-lpc2378/nsh/appconfig index d262c7c63..3d90550d5 100644 --- a/nuttx/configs/olimex-lpc2378/nsh/appconfig +++ b/nuttx/configs/olimex-lpc2378/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/olimex-lpc2378/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/olimex-strp711/nsh/appconfig b/nuttx/configs/olimex-strp711/nsh/appconfig index d5be8ec02..57fbdfeb3 100644 --- a/nuttx/configs/olimex-strp711/nsh/appconfig +++ b/nuttx/configs/olimex-strp711/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/olimex-strp711/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/appconfig b/nuttx/configs/pcblogic-pic32mx/nsh/appconfig index 54614bd6b..9b95defa8 100644 --- a/nuttx/configs/pcblogic-pic32mx/nsh/appconfig +++ b/nuttx/configs/pcblogic-pic32mx/nsh/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/pcblogic-pic32mx/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH application library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Applications configured as an NX built-in commands diff --git a/nuttx/configs/qemu-i486/nsh/appconfig b/nuttx/configs/qemu-i486/nsh/appconfig index bb90c0897..1bdd7ce5d 100644 --- a/nuttx/configs/qemu-i486/nsh/appconfig +++ b/nuttx/configs/qemu-i486/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/qemu-i486/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/sam3u-ek/knsh/appconfig b/nuttx/configs/sam3u-ek/knsh/appconfig index 3bddd2127..3e94f548d 100644 --- a/nuttx/configs/sam3u-ek/knsh/appconfig +++ b/nuttx/configs/sam3u-ek/knsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/sam3u-ek/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/sam3u-ek/nsh/appconfig b/nuttx/configs/sam3u-ek/nsh/appconfig index 3bddd2127..3e94f548d 100644 --- a/nuttx/configs/sam3u-ek/nsh/appconfig +++ b/nuttx/configs/sam3u-ek/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/sam3u-ek/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/sam3u-ek/touchscreen/appconfig b/nuttx/configs/sam3u-ek/touchscreen/appconfig index c1d902d1a..34cab1247 100644 --- a/nuttx/configs/sam3u-ek/touchscreen/appconfig +++ b/nuttx/configs/sam3u-ek/touchscreen/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/sam3u-ek/touchscreen/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH applicatin library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # The NX and NXHELLO examples configured as an NX built-in commands diff --git a/nuttx/configs/sim/nsh/appconfig b/nuttx/configs/sim/nsh/appconfig index 0cf77dd6d..264588e51 100644 --- a/nuttx/configs/sim/nsh/appconfig +++ b/nuttx/configs/sim/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/sim/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/sim/nsh2/appconfig b/nuttx/configs/sim/nsh2/appconfig index b77c1a198..c967980a5 100644 --- a/nuttx/configs/sim/nsh2/appconfig +++ b/nuttx/configs/sim/nsh2/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/nsh2/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # NSH Built-In Functions diff --git a/nuttx/configs/stm3210e-eval/nsh/appconfig b/nuttx/configs/stm3210e-eval/nsh/appconfig index 1817139f5..a3999a76a 100644 --- a/nuttx/configs/stm3210e-eval/nsh/appconfig +++ b/nuttx/configs/stm3210e-eval/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/stm3210e-eval/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -37,5 +37,6 @@ CONFIGURED_APPS += examples/nsh +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig index 22b63c04a..fb6bf1a66 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/appconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm3210e-eval/nsh2/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -37,8 +37,9 @@ CONFIGURED_APPS += examples/nsh -# The NSH applicatin library +# The NSH application library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # The NX and NXHELLO examples configured as an NX built-in commands diff --git a/nuttx/configs/stm3240g-eval/nsh/appconfig b/nuttx/configs/stm3240g-eval/nsh/appconfig index 201bddb42..a3bf2422c 100644 --- a/nuttx/configs/stm3240g-eval/nsh/appconfig +++ b/nuttx/configs/stm3240g-eval/nsh/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm3240g-eval/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH application library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Applications configured as an NX built-in commands diff --git a/nuttx/configs/stm32f4discovery/nsh/appconfig b/nuttx/configs/stm32f4discovery/nsh/appconfig index edd6dda52..770762110 100644 --- a/nuttx/configs/stm32f4discovery/nsh/appconfig +++ b/nuttx/configs/stm32f4discovery/nsh/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm32f4discovery/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH application library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Applications configured as an NX built-in commands diff --git a/nuttx/configs/sure-pic32mx/nsh/appconfig b/nuttx/configs/sure-pic32mx/nsh/appconfig index be2d77112..abf0b38a6 100644 --- a/nuttx/configs/sure-pic32mx/nsh/appconfig +++ b/nuttx/configs/sure-pic32mx/nsh/appconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/sure-pic32mx/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # The NSH application library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Applications configured as an NX built-in commands diff --git a/nuttx/configs/teensy/nsh/appconfig b/nuttx/configs/teensy/nsh/appconfig index c35042b7b..14b6bd960 100644 --- a/nuttx/configs/teensy/nsh/appconfig +++ b/nuttx/configs/teensy/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/teensy/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,6 +39,7 @@ CONFIGURED_APPS += examples/nsh # NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Networking support diff --git a/nuttx/configs/twr-k60n512/nsh/appconfig b/nuttx/configs/twr-k60n512/nsh/appconfig index d31ec4e59..456ddc8e9 100644 --- a/nuttx/configs/twr-k60n512/nsh/appconfig +++ b/nuttx/configs/twr-k60n512/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/twr-k60n512/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -37,5 +37,6 @@ CONFIGURED_APPS += examples/nsh +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/us7032evb1/nsh/appconfig b/nuttx/configs/us7032evb1/nsh/appconfig index 5b0999743..fe0916f95 100644 --- a/nuttx/configs/us7032evb1/nsh/appconfig +++ b/nuttx/configs/us7032evb1/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/us7032evb1/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig index 46f978c90..ab296219f 100755 --- a/nuttx/configs/vsn/nsh/appconfig +++ b/nuttx/configs/vsn/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/vsn/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,7 @@ CONFIGURED_APPS += examples/nsh #CONFIG_BUILTIN_APP_START="hello" # Application Libraries +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Individual selection of built-in applications: diff --git a/nuttx/configs/xtrs/nsh/appconfig b/nuttx/configs/xtrs/nsh/appconfig index 15f01ba07..ef9401691 100644 --- a/nuttx/configs/xtrs/nsh/appconfig +++ b/nuttx/configs/xtrs/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/xtrs/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/configs/z80sim/nsh/appconfig b/nuttx/configs/z80sim/nsh/appconfig index 4f7e183ac..22298ecda 100644 --- a/nuttx/configs/z80sim/nsh/appconfig +++ b/nuttx/configs/z80sim/nsh/appconfig @@ -1,8 +1,8 @@ ############################################################################ # configs/z80sim/nsh/appconfig # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,5 +39,6 @@ CONFIGURED_APPS += examples/nsh # The NSH Library +CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib diff --git a/nuttx/drivers/serial/lowconsole.c b/nuttx/drivers/serial/lowconsole.c index 1de76cc06..2c7d639e2 100644 --- a/nuttx/drivers/serial/lowconsole.c +++ b/nuttx/drivers/serial/lowconsole.c @@ -1,8 +1,8 @@ /**************************************************************************** * drivers/serial/lowconsole.c * - * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/include/nuttx/serial.h b/nuttx/include/nuttx/serial.h index 2b20f98a1..8a1b1f444 100644 --- a/nuttx/include/nuttx/serial.h +++ b/nuttx/include/nuttx/serial.h @@ -1,8 +1,8 @@ /************************************************************************************ - * serial.h + * include/nuttx/serial.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2008, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __SERIAL_H -#define __SERIAL_H +#ifndef __INCLUDE_NUTTX_SERIAL_H +#define __INCLUDE_NUTTX_SERIAL_H /************************************************************************************ * Included Files @@ -299,4 +299,4 @@ EXTERN void uart_datasent(FAR uart_dev_t *dev); } #endif -#endif /* __SERIAL_H */ +#endif /* __INCLUDE_NUTTX_SERIAL_H */ diff --git a/nuttx/lib/stdio/lib_fgets.c b/nuttx/lib/stdio/lib_fgets.c index f4061b628..e84e031f9 100644 --- a/nuttx/lib/stdio/lib_fgets.c +++ b/nuttx/lib/stdio/lib_fgets.c @@ -49,16 +49,8 @@ /**************************************************************************** * Definitions ****************************************************************************/ - -/* In some systems, the underlying serial logic may - * automatically echo characters back to the console. We - * will assume that that is not the case here - */ - -#define CONFIG_FGETS_ECHO 1 - -/* Some environments may return CR as end-of-line, others LF, and - * others both. The logic here assumes either but not both. +/* Some environments may return CR as end-of-line, others LF, and others + * both. The logic here assumes either but not both. */ #undef CONFIG_EOL_IS_CR @@ -82,57 +74,11 @@ * Private Data ****************************************************************************/ -/* <esc>[K is the VT100 command erases to the end of the line. */ - -static const char g_erasetoeol[] = "\033[K"; - /**************************************************************************** * Private Functions ****************************************************************************/ /**************************************************************************** - * Name: _lib_rawgetc - ****************************************************************************/ - -static inline int _lib_rawgetc(int fd) -{ - char buffer; - ssize_t nread; - - nread = read(fd, &buffer, 1); - if (nread < 1) - { - /* Return EOF if the end of file (0) or error (-1) occurs */ - - return EOF; - } - return (int)buffer; -} - -/**************************************************************************** - * Name: _lib_consoleputc - ****************************************************************************/ - -#ifdef CONFIG_FGETS_ECHO -static inline void _lib_consoleputc(int ch) -{ - char buffer = ch; - (void)write(1, &buffer, 1); -} -#endif - -/**************************************************************************** - * Name: _lib_consoleputs - ****************************************************************************/ - -#ifdef CONFIG_FGETS_ECHO -static inline void _lib_consoleputs(FAR const char *str) -{ - (void)write(1, str, strlen(str)); -} -#endif - -/**************************************************************************** * Global Functions ****************************************************************************/ @@ -140,28 +86,16 @@ static inline void _lib_consoleputs(FAR const char *str) * Name: fgets * * Description: - * fgets() reads in at most one less than 'buflen' characters - * from stream and stores them into the buffer pointed to - * by 'buf'. Reading stops after an EOF or a newline. If a - * newline is read, it is stored into the buffer. A null - * terminator is stored after the last character in the + * fgets() reads in at most one less than 'buflen' characters from stream + * and stores them into the buffer pointed to by 'buf'. Reading stops after + * an EOF or a newline. If a newline is read, it is stored into the + * buffer. A null terminator is stored after the last character in the * buffer. * - * Assumptions: - * If the stream corresponds to stdin (fd=0) this version - * will assume that we are reading characters from a - * VT100 console and that stdout (fd=1) is also available. - * This will not work well if fd=0 corresponds to a raw - * byte steam. - * **************************************************************************/ char *fgets(FAR char *buf, int buflen, FILE *stream) { -#ifdef CONFIG_FGETS_ECHO - bool console; -#endif - int escape = 0; int nch = 0; /* Sanity checks */ @@ -177,86 +111,16 @@ char *fgets(FAR char *buf, int buflen, FILE *stream) return buf; } - /* Check if the stream is stdin */ - -#ifdef CONFIG_FGETS_ECHO - console = (stream->fs_filedes == 0); - - /* <esc>[K is the VT100 command that erases to the end of the line. */ - - if (console) - { - _lib_consoleputs(g_erasetoeol); - } -#endif - - /* Read characters until we have a full line. On each - * the loop we must be assured that there are two free bytes - * in the line buffer: One for the next character and one for - * the null terminator. + /* Read characters until we have a full line. On each the loop we must + * be assured that there are two free bytes in the line buffer: One for + * the next character and one for the null terminator. */ for(;;) { /* Get the next character */ - int ch = _lib_rawgetc(stream->fs_filedes); - - /* Are we processing a VT100 escape sequence */ - - if (escape) - { - /* Yes, is it an <esc>[, 3 byte sequence */ - - if (ch != 0x5b || escape == 2) - { - /* We are finished with the escape sequence */ - - escape = 0; - ch = 'a'; - } - else - { - /* The next character is the end of a 3-byte sequence. - * NOTE: Some of the <esc>[ sequences are longer than - * 3-bytes, but I have not encountered any in normal use - * yet and, so, have not provided the decoding logic. - */ - - escape = 2; - } - } - - /* Check for backspace */ - - else if (ch == 0x08) - { - /* Eliminate that last character in the buffer. */ - - if (nch > 0) - { - nch--; - -#ifdef CONFIG_FGETS_ECHO - if (console) - { - /* Echo the backspace character on the console */ - - _lib_consoleputc(ch); - _lib_consoleputs(g_erasetoeol); - } -#endif - } - } - - /* Check for the beginning of a VT100 escape sequence */ - - else if (console && ch == 0x1b) - { - /* The next character is escaped */ - - escape = 1; - } + int ch = fgetc(stream); /* Check for end-of-line. This is tricky only in that some * environments may return CR as end-of-line, others LF, and @@ -264,28 +128,19 @@ char *fgets(FAR char *buf, int buflen, FILE *stream) */ #if defined(CONFIG_EOL_IS_LF) || defined(CONFIG_EOL_IS_BOTH_CRLF) - else if (ch == '\n') + if (ch == '\n') #elif defined(CONFIG_EOL_IS_CR) - else if (ch == '\r') + if (ch == '\r') #elif CONFIG_EOL_IS_EITHER_CRLF - else if (ch == '\n' || ch == '\r') + if (ch == '\n' || ch == '\r') #endif { - /* The newline is stored in the buffer along - * with the null terminator. + /* The newline is stored in the buffer along with the null + * terminator. */ buf[nch++] = '\n'; buf[nch] = '\0'; - -#ifdef CONFIG_FGETS_ECHO - if (console) - { - /* Echo the newline to the console */ - - _lib_consoleputc('\n'); - } -#endif return buf; } @@ -310,25 +165,16 @@ char *fgets(FAR char *buf, int buflen, FILE *stream) } } - /* Otherwise, check if the character is printable and, - * if so, put the character in the line buffer + /* Otherwise, check if the character is printable and, if so, put the + * character in the line buffer */ else if (isprint(ch)) { buf[nch++] = ch; -#ifdef CONFIG_FGETS_ECHO - if (console) - { - /* Echo the character to the console */ - - _lib_consoleputc(ch); - } -#endif - /* Check if there is room for another character - * and the line's null terminator. If not then - * we have to end the line now. + /* Check if there is room for another character and the line's + * null terminator. If not then we have to end the line now. */ if (nch + 1 >= buflen) @@ -338,6 +184,5 @@ char *fgets(FAR char *buf, int buflen, FILE *stream) } } } - } diff --git a/nuttx/lib/stdio/lib_gets.c b/nuttx/lib/stdio/lib_gets.c index 20b2906df..95a6b36eb 100644 --- a/nuttx/lib/stdio/lib_gets.c +++ b/nuttx/lib/stdio/lib_gets.c @@ -1,8 +1,8 @@ /**************************************************************************** * lib/stdio/lib_gets.c * - * Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2008, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -85,31 +85,27 @@ * Name: gets * * Description: - * gets() reads a line from stdin into the buffer pointed - * to by s until either a terminating newline or EOF, - * which it replaces with '\0'. No check for buffer - * overrun is performed + * gets() reads a line from stdin into the buffer pointed to by s until + * either a terminating newline or EOF, which it replaces with '\0'. No + * check for buffer overrun is performed * - * This API should not be used because it is inherently - * unsafe. Consider using fgets which is safer and - * slightly more efficient. + * This API should not be used because it is inherently unsafe. Consider + * using fgets which is safer and slightly more efficient. * **************************************************************************/ FAR char *gets(FAR char *s) { - /* gets is ALMOST the same as fgets using stdin and no - * length limit (hence, the unsafeness of gets). So let - * fgets do most of the work. + /* gets is ALMOST the same as fgets using stdin and no length limit + * (hence, the unsafeness of gets). So let fgets do most of the work. */ FAR char *ret = fgets(s, INT_MAX, stdin); if (ret) { - /* Another subtle difference from fgets is that gets - * replaces end-of-line markers with null terminators. - * We will do that as a second step (with some loss - * in performance). + /* Another subtle difference from fgets is that gets replaces + * end-of-line markers with null terminators. We will do that as + * a second step (with some loss in performance). */ int len = strlen(ret); @@ -118,6 +114,7 @@ FAR char *gets(FAR char *s) ret[len-1] = '\0'; } } + return ret; } |