diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2024-02-25 14:50:07 -0800 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2024-02-25 14:53:52 -0800 |
| commit | 3f58f96a4e8255e222953f9856bcd6c25f7b33cd (patch) | |
| tree | 16d6c08066efbe4578cb661a9f25b8f89eb4257b /libgfortran | |
| parent | d1b241b9506cdc0ebd3f43d12cf77d7c33271342 (diff) | |
| download | gcc-3f58f96a4e8255e222953f9856bcd6c25f7b33cd.zip gcc-3f58f96a4e8255e222953f9856bcd6c25f7b33cd.tar.gz gcc-3f58f96a4e8255e222953f9856bcd6c25f7b33cd.tar.bz2 | |
libgfortran: Propagate user defined iostat and iomsg.
PR libfortran/105456
libgfortran/ChangeLog:
* io/list_read.c (list_formatted_read_scalar): Add checks
for the case where a user defines their own error codes
and error messages and generate the runtime error.
* io/transfer.c (st_read_done): Whitespace.
gcc/testsuite/ChangeLog:
* gfortran.dg/pr105456.f90: New test.
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/io/list_read.c | 22 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 3d29cb6..ee3ab71 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -2138,6 +2138,7 @@ static int list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, int kind, size_t size) { + char message[MSGLEN]; gfc_char4_t *q, *r; size_t m; int c; @@ -2247,7 +2248,7 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, child_iostat = ((dtp->common.flags & IOPARM_HAS_IOSTAT) ? dtp->common.iostat : &noiostat); - /* Set iomsge, intent(inout). */ + /* Set iomsg, intent(inout). */ if (dtp->common.flags & IOPARM_HAS_IOMSG) { child_iomsg = dtp->common.iomsg; @@ -2266,6 +2267,25 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, iotype_len, child_iomsg_len); dtp->u.p.child_saved_iostat = *child_iostat; dtp->u.p.current_unit->child_dtio--; + + + if ((dtp->u.p.child_saved_iostat != 0) && + !(dtp->common.flags & IOPARM_HAS_IOMSG) && + !(dtp->common.flags & IOPARM_HAS_IOSTAT)) + { + /* Trim trailing spaces from the message. */ + for(int i = IOMSG_LEN - 1; i > 0; i--) + if (!isspace(child_iomsg[i])) + { + /* Add two to get back to the end of child_iomsg. */ + child_iomsg_len = i+2; + break; + } + free_line (dtp); + snprintf (message, child_iomsg_len, child_iomsg); + generate_error (&dtp->common, dtp->u.p.child_saved_iostat, + message); + } } break; default: diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 99ef96a..01db412 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -4556,7 +4556,7 @@ st_read_done (st_parameter_dt *dtp) if (dtp->u.p.current_unit->au) { if (dtp->common.flags & IOPARM_DT_HAS_ID) - *dtp->id = enqueue_done_id (dtp->u.p.current_unit->au, AIO_READ_DONE); + *dtp->id = enqueue_done_id (dtp->u.p.current_unit->au, AIO_READ_DONE); else { if (dtp->u.p.async) |