diff options
author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2007-01-17 20:44:00 +0100 |
---|---|---|
committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2007-01-17 19:44:00 +0000 |
commit | 0dce3ca161fa6664c8505cfe0718a9dbccb8765c (patch) | |
tree | acb8b6ff735e7961042f7c90dac13e2947fc3c83 /libgfortran/intrinsics/tty.c | |
parent | e7fd0be47b7afeb96031c3e6ba9ff0eddf7a848a (diff) | |
download | gcc-0dce3ca161fa6664c8505cfe0718a9dbccb8765c.zip gcc-0dce3ca161fa6664c8505cfe0718a9dbccb8765c.tar.gz gcc-0dce3ca161fa6664c8505cfe0718a9dbccb8765c.tar.bz2 |
re PR libfortran/27107 (Make dependency on io/io.h broken)
PR libfortran/27107
* runtime/environ.c: Don't include io/io.h.
* runtime/string.c: Don't include io/io.h.
(compare0): Add cast to avoid warning.
* runtime/error.c: Don't include io/io.h.
(st_printf): Move to io/unix.c.
* intrinsics/flush.c: Delete, contents moved to io/intrinsics.c.
* intrinsics/fget.c: Likewise.
* intrinsics/ftell.c: Likewise.
* intrinsics/tty.c: Likewise.
* libgfortran.h (DEFAULT_RECL, notification_std,
get_unformatted_convert, IOPARM_*, st_parameter_common, unit_convert,
DEFAULT_TEMPDIR): New declarations.
* io/io.h (DEFAULT_RECL, notification_std, get_unformatted_convert,
IOPARM_*, st_parameter_common, unit_convert, DEFAULT_TEMPDIR):
Move to libgfortran.h.
* io/unix.c: Add io/unix.h content.
(st_printf): New function.
* io/intrinsics.c: New file.
* io/unix.h: Remove, contents moved into unix.c.
* libtool-version: Update library version to 3.0.0.
* configure.ac: Update library version to 0.3.
* Makefile.am (intrinsics/fget.c, intrinsics/flush.c,
intrinsics/ftell.c, intrinsics/tty.c, libgfortran.h): Remove targets.
* Makefile.in: Regenerate.
* configure: Regenerate.
From-SVN: r120869
Diffstat (limited to 'libgfortran/intrinsics/tty.c')
-rw-r--r-- | libgfortran/intrinsics/tty.c | 132 |
1 files changed, 0 insertions, 132 deletions
diff --git a/libgfortran/intrinsics/tty.c b/libgfortran/intrinsics/tty.c deleted file mode 100644 index 93416f9..0000000 --- a/libgfortran/intrinsics/tty.c +++ /dev/null @@ -1,132 +0,0 @@ -/* Implementation of the ISATTY and TTYNAM g77 intrinsics. - Copyright (C) 2005 Free Software Foundation, Inc. - Contributed by François-Xavier Coudert <coudert@clipper.ens.fr> - -This file is part of the GNU Fortran 95 runtime library (libgfortran). - -Libgfortran is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -In addition to the permissions in the GNU General Public License, the -Free Software Foundation gives you unlimited permission to link the -compiled version of this file into combinations with other programs, -and to distribute those combinations without any restriction coming -from the use of this file. (The General Public License restrictions -do apply in other respects; for example, they cover modification of -the file, and distribution when not linked into a combine -executable.) - -Libgfortran is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public -License along with libgfortran; see the file COPYING. If not, -write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ - -#include "config.h" -#include "libgfortran.h" -#include "../io/io.h" - -#include <string.h> - -/* LOGICAL FUNCTION ISATTY(UNIT) - INTEGER, INTENT(IN) :: UNIT */ - -extern GFC_LOGICAL_4 isatty_l4 (int *); -export_proto(isatty_l4); - -GFC_LOGICAL_4 -isatty_l4 (int *unit) -{ - gfc_unit *u; - GFC_LOGICAL_4 ret = 0; - - u = find_unit (*unit); - if (u != NULL) - { - ret = (GFC_LOGICAL_4) stream_isatty (u->s); - unlock_unit (u); - } - return ret; -} - - -extern GFC_LOGICAL_8 isatty_l8 (int *); -export_proto(isatty_l8); - -GFC_LOGICAL_8 -isatty_l8 (int *unit) -{ - gfc_unit *u; - GFC_LOGICAL_8 ret = 0; - - u = find_unit (*unit); - if (u != NULL) - { - ret = (GFC_LOGICAL_8) stream_isatty (u->s); - unlock_unit (u); - } - return ret; -} - - -/* SUBROUTINE TTYNAM(UNIT,NAME) - INTEGER,SCALAR,INTENT(IN) :: UNIT - CHARACTER,SCALAR,INTENT(OUT) :: NAME */ - -extern void ttynam_sub (int *, char *, gfc_charlen_type); -export_proto(ttynam_sub); - -void -ttynam_sub (int *unit, char * name, gfc_charlen_type name_len) -{ - gfc_unit *u; - char * n; - int i; - - memset (name, ' ', name_len); - u = find_unit (*unit); - if (u != NULL) - { - n = stream_ttyname (u->s); - if (n != NULL) - { - i = 0; - while (*n && i < name_len) - name[i++] = *(n++); - } - unlock_unit (u); - } -} - - -extern void ttynam (char **, gfc_charlen_type *, int); -export_proto(ttynam); - -void -ttynam (char ** name, gfc_charlen_type * name_len, int unit) -{ - gfc_unit *u; - - u = find_unit (unit); - if (u != NULL) - { - *name = stream_ttyname (u->s); - if (*name != NULL) - { - *name_len = strlen (*name); - *name = strdup (*name); - unlock_unit (u); - return; - } - unlock_unit (u); - } - - *name_len = 0; - *name = NULL; -} |