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

io.h (open_external): Change prototype. 

* io/io.h (open_external): Change prototype.
	* io/unix.c (regular_file): Change prototype and set flags->action if
	needed.
	(open_external): Ditto.
	* io/open.c (new_unit): Let open_external set flags->action.

From-SVN: r91843
This commit is contained in:
Steve Ellcey 2004-12-08 00:32:39 +00:00 committed by Steve Ellcey
parent 1b79dc38dd
commit 6ecf6dcbb8
4 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgfortran/ChangeLog
View File

@ -1,3 +1,11 @@
2004-12-07 Steve Ellcey <sje@cup.hp.com>
* io/io.h (open_external): Change prototype.
* io/unix.c (regular_file): Change prototype and set flags->action if
needed.
(open_external): Ditto.
* io/open.c (new_unit): Let open_external set flags->action.
2004-12-07 Eric Botcazou <ebotcazou@libertysurf.fr>
* configure.ac: Check for ieeefp.h. Check for fabsf in libm.

2
libgfortran/io/io.h
View File

@ -400,7 +400,7 @@ int compare_files (stream *, stream *);
stream *init_error_stream (void);
#define open_external prefix(open_external)
stream *open_external (unit_action, unit_status);
stream *open_external (unit_flags *);
#define open_internal prefix(open_internal)
stream *open_internal (char *, int);

9
libgfortran/io/open.c
View File

@ -207,14 +207,13 @@ new_unit (unit_flags * flags)
stream *s;
char tmpname[5 /* fort. */ + 10 /* digits of unit number */ + 1 /* 0 */];
/* Change unspecifieds to defaults. */
/* Change unspecifieds to defaults. Leave (flags->action ==
ACTION_UNSPECIFIED) alone so open_external() can set it based on
what type of open actually works. */
if (flags->access == ACCESS_UNSPECIFIED)
flags->access = ACCESS_SEQUENTIAL;
if (flags->action == ACTION_UNSPECIFIED)
flags->action = ACTION_READWRITE; /* Processor dependent. */
if (flags->form == FORM_UNSPECIFIED)
flags->form = (flags->access == ACCESS_SEQUENTIAL)
? FORM_FORMATTED : FORM_UNFORMATTED;
@ -325,7 +324,7 @@ new_unit (unit_flags * flags)
/* Open file. */
s = open_external (flags->action, flags->status);
s = open_external (flags);
if (s == NULL)
{
generate_error (ERROR_OS, NULL);

81
libgfortran/io/unix.c
View File

@ -988,14 +988,18 @@ tempfile (void)
}
/* regular_file()-- Open a regular file. Returns the descriptor, which is less than zero on error. */
/* regular_file()-- Open a regular file.
* Change flags->action if it is ACTION_UNSPECIFIED on entry.
* Returns the descriptor, which is less than zero on error. */
static int
regular_file (unit_action action, unit_status status)
regular_file (unit_flags *flags)
{
char path[PATH_MAX + 1];
struct stat statbuf;
int mode;
int rwflag;
int fd;
if (unpack_filename (path, ioparm.file, ioparm.file_len))
{
@ -1003,30 +1007,31 @@ regular_file (unit_action action, unit_status status)
return -1;
}
mode = 0;
rwflag = 0;
switch (action)
switch (flags->action)
{
case ACTION_READ:
mode = O_RDONLY;
rwflag = O_RDONLY;
break;
case ACTION_WRITE:
mode = O_WRONLY;
rwflag = O_WRONLY;
break;
case ACTION_READWRITE:
mode = O_RDWR;
case ACTION_UNSPECIFIED:
rwflag = O_RDWR;
break;
default:
internal_error ("regular_file(): Bad action");
}
switch (status)
switch (flags->status)
{
case STATUS_NEW:
mode |= O_CREAT | O_EXCL;
rwflag |= O_CREAT | O_EXCL;
break;
case STATUS_OLD: /* file must exist, so check for its existence */
@ -1036,40 +1041,74 @@ regular_file (unit_action action, unit_status status)
case STATUS_UNKNOWN:
case STATUS_SCRATCH:
mode |= O_CREAT;
rwflag |= O_CREAT;
break;
case STATUS_REPLACE:
mode |= O_CREAT | O_TRUNC;
rwflag |= O_CREAT | O_TRUNC;
break;
default:
internal_error ("regular_file(): Bad status");
}
/* mode |= O_LARGEFILE; */
/* rwflag |= O_LARGEFILE; */
return open (path, mode,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
fd = open (path, rwflag, mode);
if (flags->action == ACTION_UNSPECIFIED)
{
if (fd < 0)
{
rwflag = rwflag & !O_RDWR | O_RDONLY;
fd = open (path, rwflag, mode);
if (fd < 0)
{
rwflag = rwflag & !O_RDONLY | O_WRONLY;
fd = open (path, rwflag, mode);
if (fd < 0)
flags->action = ACTION_READWRITE; /* Could not open at all. */
else
flags->action = ACTION_WRITE;
}
else
flags->action = ACTION_READ;
}
else
flags->action = ACTION_READWRITE;
}
return fd;
}
/* open_external()-- Open an external file, unix specific version.
* Change flags->action if it is ACTION_UNSPECIFIED on entry.
* Returns NULL on operating system error. */
stream *
open_external (unit_action action, unit_status status)
open_external (unit_flags *flags)
{
int fd, prot;
fd =
(status == STATUS_SCRATCH) ? tempfile () : regular_file (action, status);
if (flags->status == STATUS_SCRATCH)
{
fd = tempfile ();
if (flags->action == ACTION_UNSPECIFIED)
flags->action = ACTION_READWRITE;
/* We can unlink scratch files now and it will go away when closed. */
unlink (ioparm.file);
}
else
{
/* regular_file resets flags->action if it is ACTION_UNSPECIFIED. */
fd = regular_file (flags);
}
if (fd < 0)
return NULL;
fd = fix_fd (fd);
switch (action)
switch (flags->action)
{
case ACTION_READ:
prot = PROT_READ;
@ -1087,12 +1126,6 @@ open_external (unit_action action, unit_status status)
internal_error ("open_external(): Bad action");
}
/* If this is a scratch file, we can unlink it now and the file will
* go away when it is closed. */
if (status == STATUS_SCRATCH)
unlink (ioparm.file);
return fd_to_stream (fd, prot);
}