PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

2009-02-23 Craig Howland <howland@LGSInnovations.com> 

* libc/unix/ttyname.c:  Remove ttyname_r() (to a new file to avoid
        coupling ttyname_r() and ttyname() due to the latter's large buffer).
        * libc/unix/ttyname_r.c:  New file to hold ttyname_r(), previously in
        ttyname.c.
        * libc/unix/ttyname.h:  New file (common size definition for the 2
        ttyname*c files that are now split).
        * libc/unix/Makefile.am (ELIX_2_SOURCES):  Add ttyname_r.c.
        * libc/unix/Makefile.in:  Regenerate.
This commit is contained in:
Jeff Johnston 2009-02-23 23:42:03 +00:00
parent 8ec5da1ff6
commit 02b20a2311
6 changed files with 125 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
newlib/ChangeLog
View File

@ -1,3 +1,14 @@
2009-02-23 Craig Howland <howland@LGSInnovations.com>
* libc/unix/ttyname.c: Remove ttyname_r() (to a new file to avoid
coupling ttyname_r() and ttyname() due to the latter's large buffer).
* libc/unix/ttyname_r.c: New file to hold ttyname_r(), previously in
ttyname.c.
* libc/unix/ttyname.h: New file (common size definition for the 2
ttyname*c files that are now split).
* libc/unix/Makefile.am (ELIX_2_SOURCES): Add ttyname_r.c.
* libc/unix/Makefile.in: Regenerate.
2009-02-19 Corinna Vinschen <corinna@vinschen.de>
* libc/include/wchar.h (mbsnrtowcs): Declare.

3
newlib/libc/unix/Makefile.am
View File

@ -12,7 +12,8 @@ GENERAL_SOURCES = \
## Distinguish different EL/IX level interfaces
ELIX_2_SOURCES = \
ttyname.c
ttyname.c \
ttyname_r.c
ELIX_4_SOURCES = \
basename.c \

13
newlib/libc/unix/Makefile.in
View File

@ -59,7 +59,7 @@ lib_a_AR = $(AR) $(ARFLAGS)
lib_a_LIBADD =
am__objects_1 = lib_a-getcwd.$(OBJEXT) lib_a-pread.$(OBJEXT) \
lib_a-pwrite.$(OBJEXT) lib_a-sigset.$(OBJEXT)
am__objects_2 = lib_a-ttyname.$(OBJEXT)
am__objects_2 = lib_a-ttyname.$(OBJEXT) lib_a-ttyname_r.$(OBJEXT)
am__objects_3 = lib_a-basename.$(OBJEXT) lib_a-dirname.$(OBJEXT) \
lib_a-getlogin.$(OBJEXT) lib_a-getpass.$(OBJEXT) \
lib_a-getpwent.$(OBJEXT) lib_a-getut.$(OBJEXT)
@ -74,7 +74,7 @@ lib_a_OBJECTS = $(am_lib_a_OBJECTS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
libunix_la_LIBADD =
am__objects_5 = getcwd.lo pread.lo pwrite.lo sigset.lo
am__objects_6 = ttyname.lo
am__objects_6 = ttyname.lo ttyname_r.lo
am__objects_7 = basename.lo dirname.lo getlogin.lo getpass.lo \
getpwent.lo getut.lo
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_8 = $(am__objects_6) \
@ -278,7 +278,8 @@ GENERAL_SOURCES = \
sigset.c
ELIX_2_SOURCES = \
ttyname.c
ttyname.c \
ttyname_r.c
ELIX_4_SOURCES = \
basename.c \
@ -402,6 +403,12 @@ lib_a-ttyname.o: ttyname.c
lib_a-ttyname.obj: ttyname.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname.obj `if test -f 'ttyname.c'; then $(CYGPATH_W) 'ttyname.c'; else $(CYGPATH_W) '$(srcdir)/ttyname.c'; fi`
lib_a-ttyname_r.o: ttyname_r.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.o `test -f 'ttyname_r.c' || echo '$(srcdir)/'`ttyname_r.c
lib_a-ttyname_r.obj: ttyname_r.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.obj `if test -f 'ttyname_r.c'; then $(CYGPATH_W) 'ttyname_r.c'; else $(CYGPATH_W) '$(srcdir)/ttyname_r.c'; fi`
lib_a-basename.o: basename.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-basename.o `test -f 'basename.c' || echo '$(srcdir)/'`basename.c

59
newlib/libc/unix/ttyname.c
View File

@ -28,67 +28,14 @@
* SUCH DAMAGE.
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "ttyname.h"
#include <dirent.h>
#include <unistd.h>
#include <string.h>
#include <paths.h>
#include <_syslist.h>
#include <errno.h>
static char ttyname_buf[sizeof (_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
/*
* ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
*/
int
_DEFUN( ttyname_r,(fd, name, namesize),
int fd _AND
char *name _AND
size_t namesize)
{
struct stat sb;
struct dirent *dirp;
DIR *dp;
struct stat dsb;
char buf[sizeof(ttyname_buf)];
/* Must be a terminal. */
if (!isatty(fd))
return ENOTTY;
/* Must be a character device. */
if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
return ENOTTY;
if ((dp = opendir (_PATH_DEV)) == NULL)
return EBADF;
strcpy(buf, _PATH_DEV);
while ((dirp = readdir (dp)) != NULL)
{
if (dirp->d_ino != sb.st_ino)
continue;
strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
sb.st_ino != dsb.st_ino)
continue;
(void) closedir (dp);
if(strlen(buf) < namesize) /* < to account for terminating null */
{
strcpy(name, buf);
return 0;
}
else
{
return ERANGE;
}
}
(void) closedir (dp);
return EBADF;
}
static char ttyname_buf[TTYNAME_BUFSIZE] = _PATH_DEV;
/*
* ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name

6
newlib/libc/unix/ttyname.h Normal file
View File

@ -0,0 +1,6 @@
/* Common defines for ttyname.c and ttyname_r.c */
#include <dirent.h> /* For MAXNAMLEN */
#include <paths.h> /* For _PATH_DEV */
#define TTYNAME_BUFSIZE (sizeof (_PATH_DEV) + MAXNAMLEN)

93
newlib/libc/unix/ttyname_r.c Normal file
View File

@ -0,0 +1,93 @@
#ifndef _NO_TTYNAME
/*
* Copyright (c) 1988 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.
* 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.
*/
#include "ttyname.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <string.h>
#include <paths.h>
#include <_syslist.h>
#include <errno.h>
/*
* ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
*/
int
_DEFUN( ttyname_r,(fd, name, namesize),
int fd _AND
char *name _AND
size_t namesize)
{
struct stat sb;
struct dirent *dirp;
DIR *dp;
struct stat dsb;
char buf[TTYNAME_BUFSIZE];
/* Must be a terminal. */
if (!isatty(fd))
return ENOTTY;
/* Must be a character device. */
if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
return ENOTTY;
if ((dp = opendir (_PATH_DEV)) == NULL)
return EBADF;
strcpy(buf, _PATH_DEV);
while ((dirp = readdir (dp)) != NULL)
{
if (dirp->d_ino != sb.st_ino)
continue;
strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
sb.st_ino != dsb.st_ino)
continue;
(void) closedir (dp);
if(strlen(buf) < namesize) /* < to account for terminating null */
{
strcpy(name, buf);
return 0;
}
else
{
return ERANGE;
}
}
(void) closedir (dp);
return EBADF;
}
#endif /* !_NO_TTYNAME */