diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2008-02-27 12:12:14 +0000 |
|---|---|---|
| committer | Samuel Tardieu <sam@gcc.gnu.org> | 2008-02-27 12:12:14 +0000 |
| commit | acf6b7ab30dceb969bf30ab966ea22acdd06aca6 (patch) | |
| tree | dea6ecdd948269cf4c4c4ca2fd972c247c37c153 /gcc/ada | |
| parent | f5c064ab04a306a571f36b1d59db2c0337433f3e (diff) | |
| download | gcc-acf6b7ab30dceb969bf30ab966ea22acdd06aca6.zip gcc-acf6b7ab30dceb969bf30ab966ea22acdd06aca6.tar.gz gcc-acf6b7ab30dceb969bf30ab966ea22acdd06aca6.tar.bz2 | |
re PR ada/22255 (Reset on shared file causes Use_Error.)
gcc/ada/
PR ada/22255
* s-fileio.adb (Reset): Do not raise Use_Error if mode isn't changed.
gcc/testsuite/
PR ada/22255
* gnat.dg/test_direct_io.adb: New file.
From-SVN: r132708
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/s-fileio.adb | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f509596..d86bfeb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2008-02-27 Samuel Tardieu <sam@rfc1149.net> + PR ada/22255 + * s-fileio.adb (Reset): Do not raise Use_Error if mode isn't changed. + +2008-02-27 Samuel Tardieu <sam@rfc1149.net> + PR ada/34799 * sem_ch13.adb (Analyze_Record_Representation_Clause): Check that underlying type is present. diff --git a/gcc/ada/s-fileio.adb b/gcc/ada/s-fileio.adb index a56877e..4a8393c 100644 --- a/gcc/ada/s-fileio.adb +++ b/gcc/ada/s-fileio.adb @@ -1074,13 +1074,15 @@ package body System.File_IO is begin Check_File_Open (File); - -- Change of mode not allowed for shared file or file with no name - -- or file that is not a regular file, or for a system file. - - if File.Shared_Status = Yes - or else File.Name'Length <= 1 - or else File.Is_System_File - or else not File.Is_Regular_File + -- Change of mode not allowed for shared file or file with no name or + -- file that is not a regular file, or for a system file. Note that we + -- allow the "change" of mode if it is not in fact doing a change. + + if Mode /= File.Mode + and then (File.Shared_Status = Yes + or else File.Name'Length <= 1 + or else File.Is_System_File + or else not File.Is_Regular_File) then raise Use_Error; |