From 6bbfb2b7ca40d05b315a6c230c84191a16c8b9cc Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 27 Oct 2014 12:29:15 -0600 Subject: [PATCH 1/2] Add isatty() function. From Alan Carvalho de Assis --- include/termios.h | 4 +++ libc/termios/Make.defs | 4 +-- libc/termios/lib_isatty.c | 71 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 libc/termios/lib_isatty.c diff --git a/include/termios.h b/include/termios.h index b927dfa0c6..575367cf23 100644 --- a/include/termios.h +++ b/include/termios.h @@ -298,6 +298,10 @@ int tcsendbreak(int fd, int duration); int tcsetattr(int fd, int options, FAR const struct termios *termiosp); +/* Check if a file descriptor corresponds to a terminal I/O file */ + +int isatty(int fd); + #undef EXTERN #ifdef __cplusplus } diff --git a/libc/termios/Make.defs b/libc/termios/Make.defs index d20a5f95c7..e5a913d6e3 100644 --- a/libc/termios/Make.defs +++ b/libc/termios/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # libc/misc/Make.defs # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ ifeq ($(CONFIG_SERIAL_TERMIOS),y) # Add the termios C files to the build -CSRCS += lib_cfgetspeed.c lib_cfsetspeed.c lib_tcflush.c +CSRCS += lib_cfgetspeed.c lib_cfsetspeed.c lib_isatty.c lib_tcflush.c CSRCS += lib_tcgetattr.c lib_tcsetattr.c # Add the termios directory to the build diff --git a/libc/termios/lib_isatty.c b/libc/termios/lib_isatty.c new file mode 100644 index 0000000000..6f0ec589fb --- /dev/null +++ b/libc/termios/lib_isatty.c @@ -0,0 +1,71 @@ +/**************************************************************************** + * libc/termios/lib_tcflush.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Alan Carvalho de Assis + * + * Source: + * https://github.com/raggi/apue.2e/blob/master/termios/isatty.c + * based on Advanced Programming in the UNIX Environment + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: isatty + * + * Description: + * Return a non-zero (true) value if the file descriptor, fd, corresponds + * to a TTYY. + * + * NOTE: Nuttx, of course, does not have true TTYs in the sense that this + * function is intended. In this implementation, the function simply + * returns true if the file descriptor is associated with a driver that + * responds wo tcgetattr() without an error -- that it, the driver supports + * the NuttX TCGETS ioctl command. + * + * Of course, that can only be true if CONFIG_SERIAL_TERMIOS=y. + * + ****************************************************************************/ + +int isatty(int fd) +{ + struct termios ts; + return (tcgetattr(fd, &ts) >= 0); +} From 02f64e513ee689f9c86c66ee58ab7695430f188d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 27 Oct 2014 12:32:31 -0600 Subject: [PATCH 2/2] Update ChangeLog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 269dfe2b81..9eb98f67c0 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8892,4 +8892,5 @@ * include/wchar.h: Add a mostly bogus wchar.h header file. This file is mostly bogus because noneo of the wide character operations are currently supported in the Nuttx C library (2014-10-27). - + * include/termios.h, libc/termios/lib_isatty.c, and Make.defs: Add + isatty() function. From Alan Carvalho de Assis (2014-10-27).