OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR 44931 Move struct unix_stream to unix.c

Browse Source 
From-SVN: r166325
This commit is contained in:
Janne Blomqvist 2010-11-04 21:29:28 +02:00
parent 269c80f2a6
commit ce66b6f6ca
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libgfortran/ChangeLog
View File

@ -1,3 +1,12 @@
2010-11-04 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/44931
* io/inquire.c (inquire_via_unit): Use stream_ttyname() instead of
calling ttyname() directly.
* io/unix.h (unix_stream): Move struct to unix.c.
* io/unix.c: Move struct unix_stream here.
(stream_ttyname): Don't mark the argument as unused if it is used.
2010-11-04 Janne Blomqvist <jb@gcc.gnu.org>
* io/unix.h (struct unix_stream): Remove prot member.

2
libgfortran/io/inquire.c
View File

@ -73,7 +73,7 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u)
|| u->unit_number == options.stdout_unit
|| u->unit_number == options.stderr_unit)
{
char * tmp = ttyname (((unix_stream *) u->s)->fd);
char * tmp = stream_ttyname (u->s);
if (tmp != NULL)
{
int tmplen = strlen (tmp);

33
libgfortran/io/unix.c
View File

@ -167,6 +167,27 @@ fallback_access (const char *path, int mode)
static const int BUFFER_SIZE = 8192;
typedef struct
{
stream st;
gfc_offset buffer_offset; /* File offset of the start of the buffer */
gfc_offset physical_offset; /* Current physical file offset */
gfc_offset logical_offset; /* Current logical file offset */
gfc_offset file_length; /* Length of the file, -1 if not seekable. */
char *buffer; /* Pointer to the buffer. */
int fd; /* The POSIX file descriptor. */
int active; /* Length of valid bytes in the buffer */
int ndirty; /* Dirty bytes starting at buffer_offset */
int special_file; /* =1 if the fd refers to a special file */
}
unix_stream;
/* fix_fd()-- Given a file descriptor, make sure it is not one of the
* standard descriptors, returning a non-standard descriptor. If the
* user specifies that system errors should go to standard output,
@ -1786,14 +1807,18 @@ stream_isatty (stream *s)
}
char *
#ifdef HAVE_TTYNAME
stream_ttyname (stream *s)
{
return ttyname (((unix_stream *) s)->fd);
}
#else
stream_ttyname (stream *s __attribute__ ((unused)))
{
#ifdef HAVE_TTYNAME
return ttyname (((unix_stream *) s)->fd);
#else
return NULL;
#endif
}
#endif
/* How files are stored: This is an operating-system specific issue,

21
libgfortran/io/unix.h
View File

@ -42,27 +42,6 @@ struct stream
};
typedef struct
{
stream st;
gfc_offset buffer_offset; /* File offset of the start of the buffer */
gfc_offset physical_offset; /* Current physical file offset */
gfc_offset logical_offset; /* Current logical file offset */
gfc_offset file_length; /* Length of the file, -1 if not seekable. */
char *buffer; /* Pointer to the buffer. */
int fd; /* The POSIX file descriptor. */
int active; /* Length of valid bytes in the buffer */
int ndirty; /* Dirty bytes starting at buffer_offset */
int special_file; /* =1 if the fd refers to a special file */
}
unix_stream;
/* Inline functions for doing file I/O given a stream. */
static inline ssize_t
sread (stream * s, void * buf, ssize_t nbyte)