From a639937a9ab176d7c38c1de7ef0d3b0d7643f856 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 3 Jan 2008 22:33:37 +0000 Subject: 2008-01-03 Jeff Johnston Make isatty syscall handling consistent with other newlib syscalls. * libc/include/_syslist.h: Add _isatty. * libc/include/reent.h: Add _isatty_r. * libc/include/sys/unistd.h: Add _isatty. * libc/posix/Makefile.am: Add new _isatty.c file. * libc/posix/Makefile.in: Regenerated. * libc/posix/_isatty.c: New file. * libc/posix/isatty.c: Changed to call _isatty(). * libc/reent/Makefile.am: Add new isattyr.c file. * libc/reent/Makefile.in: Regenerated. * libc/reent/isattyr.c: New file. * libc/stdio/freopen.c: Changed to call _isatty_r(). * libc/stdio/makebuf.c: Ditto. * libc/sys/a29khif/_isatty.S: Change isatty to _isatty. * libc/sys/arc/isatty.c: Ditto. * libc/sys/arm/syscalls.c: Ditto. * libc/sys/d10v/syscalls.c: Ditto. * libc/sys/h8300hms/syscalls.c: Ditto. * libc/sys/h8500hms/syscalls.c: Ditto. * libc/sys/linux/Makefile.am: Add new isatty.c file. * libc/sys/linux/Makefile.in: Regenerated. * libc/sys/linux/isatty.c: New file. * libc/syscalls/Makefile.am: Add new sysisatty.c file. * libc/syscalls/Makefile.in: Regenerated. * libc/syscalls/sysisatty.c: New file. --- newlib/libc/posix/Makefile.am | 2 +- newlib/libc/posix/Makefile.in | 22 +++++++++++++++------- newlib/libc/posix/_isatty.c | 17 +++++++++++++++++ newlib/libc/posix/isatty.c | 13 +++---------- 4 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 newlib/libc/posix/_isatty.c (limited to 'newlib/libc/posix') diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am index 649451645..2091b4110 100644 --- a/newlib/libc/posix/Makefile.am +++ b/newlib/libc/posix/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) GENERAL_SOURCES = \ - closedir.c creat.c isatty.c \ + closedir.c creat.c _isatty.c isatty.c \ opendir.c readdir.c \ readdir_r.c rewinddir.c sleep.c usleep.c \ telldir.c diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in index 1ac32b7a7..e301129fb 100644 --- a/newlib/libc/posix/Makefile.in +++ b/newlib/libc/posix/Makefile.in @@ -56,10 +56,11 @@ ARFLAGS = cru lib_a_AR = $(AR) $(ARFLAGS) lib_a_LIBADD = am__objects_1 = lib_a-closedir.$(OBJEXT) lib_a-creat.$(OBJEXT) \ - lib_a-isatty.$(OBJEXT) lib_a-opendir.$(OBJEXT) \ - lib_a-readdir.$(OBJEXT) lib_a-readdir_r.$(OBJEXT) \ - lib_a-rewinddir.$(OBJEXT) lib_a-sleep.$(OBJEXT) \ - lib_a-usleep.$(OBJEXT) lib_a-telldir.$(OBJEXT) + lib_a-_isatty.$(OBJEXT) lib_a-isatty.$(OBJEXT) \ + lib_a-opendir.$(OBJEXT) lib_a-readdir.$(OBJEXT) \ + lib_a-readdir_r.$(OBJEXT) lib_a-rewinddir.$(OBJEXT) \ + lib_a-sleep.$(OBJEXT) lib_a-usleep.$(OBJEXT) \ + lib_a-telldir.$(OBJEXT) am__objects_2 = lib_a-scandir.$(OBJEXT) lib_a-seekdir.$(OBJEXT) am__objects_3 = lib_a-execl.$(OBJEXT) lib_a-execle.$(OBJEXT) \ lib_a-execlp.$(OBJEXT) lib_a-execv.$(OBJEXT) \ @@ -77,8 +78,9 @@ am__objects_4 = lib_a-popen.$(OBJEXT) lib_a_OBJECTS = $(am_lib_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) libposix_la_LIBADD = -am__objects_6 = closedir.lo creat.lo isatty.lo opendir.lo readdir.lo \ - readdir_r.lo rewinddir.lo sleep.lo usleep.lo telldir.lo +am__objects_6 = closedir.lo creat.lo _isatty.lo isatty.lo opendir.lo \ + readdir.lo readdir_r.lo rewinddir.lo sleep.lo usleep.lo \ + telldir.lo am__objects_7 = scandir.lo seekdir.lo am__objects_8 = execl.lo execle.lo execlp.lo execv.lo execve.lo \ execvp.lo @@ -270,7 +272,7 @@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) GENERAL_SOURCES = \ - closedir.c creat.c isatty.c \ + closedir.c creat.c _isatty.c isatty.c \ opendir.c readdir.c \ readdir_r.c rewinddir.c sleep.c usleep.c \ telldir.c @@ -381,6 +383,12 @@ lib_a-creat.o: creat.c lib_a-creat.obj: creat.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-creat.obj `if test -f 'creat.c'; then $(CYGPATH_W) 'creat.c'; else $(CYGPATH_W) '$(srcdir)/creat.c'; fi` +lib_a-_isatty.o: _isatty.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-_isatty.o `test -f '_isatty.c' || echo '$(srcdir)/'`_isatty.c + +lib_a-_isatty.obj: _isatty.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-_isatty.obj `if test -f '_isatty.c'; then $(CYGPATH_W) '_isatty.c'; else $(CYGPATH_W) '$(srcdir)/_isatty.c'; fi` + lib_a-isatty.o: isatty.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-isatty.o `test -f 'isatty.c' || echo '$(srcdir)/'`isatty.c diff --git a/newlib/libc/posix/_isatty.c b/newlib/libc/posix/_isatty.c new file mode 100644 index 000000000..7260211ef --- /dev/null +++ b/newlib/libc/posix/_isatty.c @@ -0,0 +1,17 @@ +/* isatty.c */ + +/* Dumb implementation so programs will at least run. */ + +#include + +int +_DEFUN(_isatty, (fd), int fd) +{ + struct stat buf; + + if (fstat (fd, &buf) < 0) + return 0; + if (S_ISCHR (buf.st_mode)) + return 1; + return 0; +} diff --git a/newlib/libc/posix/isatty.c b/newlib/libc/posix/isatty.c index 2732ca2a0..afd5ec85e 100644 --- a/newlib/libc/posix/isatty.c +++ b/newlib/libc/posix/isatty.c @@ -1,17 +1,10 @@ /* isatty.c */ -/* Dumb implementation so programs will at least run. */ - -#include +#include +#include int _DEFUN(isatty, (fd), int fd) { - struct stat buf; - - if (fstat (fd, &buf) < 0) - return 0; - if (S_ISCHR (buf.st_mode)) - return 1; - return 0; + return _isatty (fd); } -- cgit v1.2.3