From e161767e51ce8eff2a49114ebb980c18b7705978 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 18 Oct 2018 14:33:58 +0200 Subject: Remove ttyname() This function is provided by Newlib since 2000. Update #3409. --- cpukit/Makefile.am | 1 - cpukit/configure.ac | 2 +- cpukit/libcsupport/src/ttyname.c | 121 --------------------------------------- 3 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 cpukit/libcsupport/src/ttyname.c diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 0d82c71b2c..3524d39610 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -253,7 +253,6 @@ librtemscpu_a_SOURCES += libcsupport/src/termios_setbestbaud.c librtemscpu_a_SOURCES += libcsupport/src/termios_setinitialbaud.c librtemscpu_a_SOURCES += libcsupport/src/__times.c librtemscpu_a_SOURCES += libcsupport/src/truncate.c -librtemscpu_a_SOURCES += libcsupport/src/ttyname.c librtemscpu_a_SOURCES += libcsupport/src/uenvgetgroups.c librtemscpu_a_SOURCES += libcsupport/src/umask.c librtemscpu_a_SOURCES += libcsupport/src/unlink.c diff --git a/cpukit/configure.ac b/cpukit/configure.ac index bc6337a4fc..149eb0bda0 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -164,7 +164,7 @@ AC_LANG_POP(C) AC_CHECK_DECLS([getrusage],,,[#include sys/resource.h]) # Newlib's unix/ directory -AC_CHECK_FUNCS([ttyname getcwd]) +AC_CHECK_FUNCS([getcwd]) # # Check if the installed toolchain provides these headers diff --git a/cpukit/libcsupport/src/ttyname.c b/cpukit/libcsupport/src/ttyname.c deleted file mode 100644 index f136e89a17..0000000000 --- a/cpukit/libcsupport/src/ttyname.c +++ /dev/null @@ -1,121 +0,0 @@ -/** - * @file - * - * @brief Demetermine Terminal Device Name - * @ingroup libcsupport - */ - -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - */ - - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#ifndef HAVE_TTYNAME - -#include -#include -#include -#include -#include -#include -#include -#include -#include <_syslist.h> -#include - -#include -#include - -static char ttyname_buf[sizeof (_PATH_DEV) + MAXNAMLEN]; - -/** - * ttyname_r() - POSIX 1003.1b 4.7.2 - Demetermine Terminal Device Name - */ -int ttyname_r( - int fd, - char *name, - size_t namesize -) -{ - struct stat sb; - struct termios tty; - struct dirent *dirp; - DIR *dp; - struct stat dsb; - char *rval; - - /* Must be a terminal. */ - if (tcgetattr (fd, &tty) < 0) - rtems_set_errno_and_return_minus_one(EBADF); - - /* Must be a character device. */ - if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode)) - rtems_set_errno_and_return_minus_one(EBADF); - - if ((dp = opendir (_PATH_DEV)) == NULL) - rtems_set_errno_and_return_minus_one(EBADF); - - /* Place the base directory in the path. */ - strncpy (name, _PATH_DEV, namesize); - - for (rval = NULL; (dirp = readdir (dp)) != NULL ;) - { - if (dirp->d_ino != sb.st_ino) - continue; - strcpy (name + sizeof (_PATH_DEV) - 1, dirp->d_name); - if (stat (name, &dsb) || sb.st_dev != dsb.st_dev || - sb.st_ino != dsb.st_ino) - continue; - rval = name; - break; - } - (void) closedir (dp); - return 0; -} - -/** - * ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name - */ -char *ttyname( - int fd -) -{ - if ( !ttyname_r( fd, ttyname_buf, sizeof(ttyname_buf) ) ) - return ttyname_buf; - return NULL; -} - -#endif -- cgit v1.2.3