[PR libfortran/62768] Handle filenames with embedded nulls

Hans-Peter Nilsson hp@bitrange.com
Wed Sep 17 16:12:00 GMT 2014


On Wed, 17 Sep 2014, Janne Blomqvist wrote:
> > /tmp/hpautotest-gcc1/gcc/libgfortran/io/inquire.c:97:41: error: 'gfc_unit' has no member named 'file'
> >      fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
> >                                          ^
> > /tmp/hpautotest-gcc1/gcc/libgfortran/io/inquire.c:97:50: error: 'gfc_unit' has no member named 'file_len'
> >      fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
> >                                                   ^
> > make[3]: *** [inquire.lo] Error 1
> >
> > brgds, H-P
>
> Oops, I forgot to update some parts in an #ifdef branch that isn't
> taken on my target. I'll try to find time to fix it later tonight. If
> you're in a hurry, just replace
>
> fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
>
> with
>
> cf_strcpy (iqp->name, iqp->name_len, u->filename);
>
> in inquire.c.

Thanks, build completes and I'll commit the following as obvious
if there are no regressions.  (The indentation change is
correct; lining up with the "else".  Note the closing brace.)

	* libgfortran/io/inquire.c (inquire_via_unit)
	[!HAVE_TTYNAME && !HAVE_TTYNAME_R && !__MINGW32__]: Adjust for
	last commit.

Index: libgfortran/io/inquire.c
===================================================================
--- libgfortran/io/inquire.c	(revision 215321)
+++ libgfortran/io/inquire.c	(working copy)
@@ -94,7 +94,7 @@ inquire_via_unit (st_parameter_inquire *
       else
 	fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
 #else
-    fstrcpy (iqp->name, iqp->name_len, u->file, u->file_len);
+      cf_fstrcpy (iqp->name, iqp->name_len, u->filename);
 #endif
     }

brgds, H-P



More information about the Gcc-patches mailing list