mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 06:42:32 +08:00
Move lib/stdio/lib_fgets.c to apps/system/readline; simplify fgets(); use readline instead of fgets in NSH
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4356 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
+19
-174
@@ -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,56 +74,10 @@
|
||||
* 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
+13
-16
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user