[gcc r14-5646] ada: Fix Ada.Text_IO.Delete with "encoding=8bits" form

[gcc r14-5646] ada: Fix Ada.Text_IO.Delete with "encoding=8bits" form

[Marc Poulhi?s]

https://gcc.gnu.org/g:a5fbba52e98f8685220ce13d06716cde2ed6a598

commit r14-5646-ga5fbba52e98f8685220ce13d06716cde2ed6a598
Author: Ronan Desplanques <desplanques@adacore.com>
Date:   Mon Oct 23 16:02:07 2023 +0200

    ada: Fix Ada.Text_IO.Delete with "encoding=8bits" form
    
    Before this patch, on Windows, file with non-ASCII Latin1 names could be created
    with Ada.Text_IO.Create by passing "encoding=8bits" through the Form
    parameter and a Latin1-encoded string through the Name parameter,
    but calling Ada.Text_IO.Delete on them raised an illegitimate exception.
    
    This patch fixes this by making the wrappers of the unlink system function
    aware of the encoding value passed through the Form parameter. It also
    removes an unnecessary curly-brace block.
    
    gcc/ada/
    
            * adaint.c (__gnat_unlink): Add new parameter and fix text
            conversion on Windows. Remove unnecessary curly braces.
            * adaint.h (__gnat_unlink): Add new parameter.
            * libgnat/i-cstrea.ads (unlink): Adapt to __gnat_unlink signature
            change.
            * libgnat/i-cstrea.adb (unlink): New Subprogram definition.
            * libgnat/s-crtl.ads (unlink): Adapt to __gnat_unlink signature
            change.
            * libgnat/s-fileio.adb (Delete): Pass encoding argument to unlink.

Diff:
---
 gcc/ada/adaint.c             | 14 +++++++++-----
 gcc/ada/adaint.h             |  2 +-
 gcc/ada/libgnat/i-cstrea.adb |  9 +++++++++
 gcc/ada/libgnat/i-cstrea.ads |  3 +--
 gcc/ada/libgnat/s-crtl.ads   |  3 ++-
 gcc/ada/libgnat/s-fileio.adb |  3 ++-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index bb4ed2607e5..4ab95658c62 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -747,15 +747,19 @@ __gnat_os_filename (char *filename ATTRIBUTE_UNUSED,
 /* Delete a file.  */
 
 int
-__gnat_unlink (char *path)
+__gnat_unlink (char *path, int encoding ATTRIBUTE_UNUSED)
 {
 #if defined (__MINGW32__) && ! defined (__vxworks) && ! defined (IS_CROSS)
-  {
-    TCHAR wpath[GNAT_MAX_PATH_LEN];
+  TCHAR wpath[GNAT_MAX_PATH_LEN];
 
+  if (encoding == Encoding_Unspecified)
     S2WSC (wpath, path, GNAT_MAX_PATH_LEN);
-    return _tunlink (wpath);
-  }
+  else if (encoding == Encoding_UTF8)
+    S2WSU (wpath, path, GNAT_MAX_PATH_LEN);
+  else
+    S2WS (wpath, path, GNAT_MAX_PATH_LEN);
+
+  return _tunlink (wpath);
 #else
   return unlink (path);
 #endif
diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
index 987432c9307..298ea9e2f9f 100644
--- a/gcc/ada/adaint.h
+++ b/gcc/ada/adaint.h
@@ -172,7 +172,7 @@ extern int    __gnat_open_new_temp		   (char *, int);
 extern int    __gnat_mkdir			   (char *, int);
 extern int    __gnat_stat			   (char *,
 						    GNAT_STRUCT_STAT *);
-extern int    __gnat_unlink                        (char *);
+extern int    __gnat_unlink                        (char *, int encoding);
 extern int    __gnat_rename                        (char *, char *);
 extern int    __gnat_chdir                         (char *);
 extern int    __gnat_rmdir                         (char *);
diff --git a/gcc/ada/libgnat/i-cstrea.adb b/gcc/ada/libgnat/i-cstrea.adb
index f761f3f73ae..fe668e159ad 100644
--- a/gcc/ada/libgnat/i-cstrea.adb
+++ b/gcc/ada/libgnat/i-cstrea.adb
@@ -130,4 +130,13 @@ package body Interfaces.C_Streams is
       return C_setvbuf (stream, buffer, mode, size);
    end setvbuf;
 
+   ------------
+   -- unlink --
+   ------------
+
+   function unlink (filename : chars) return int is
+   begin
+      return System.CRTL.unlink (filename);
+   end unlink;
+
 end Interfaces.C_Streams;
diff --git a/gcc/ada/libgnat/i-cstrea.ads b/gcc/ada/libgnat/i-cstrea.ads
index 39111225db4..67f10cf0b42 100644
--- a/gcc/ada/libgnat/i-cstrea.ads
+++ b/gcc/ada/libgnat/i-cstrea.ads
@@ -197,8 +197,7 @@ package Interfaces.C_Streams is
    function ungetc (c : int; stream : FILEs) return int
      renames System.CRTL.ungetc;
 
-   function unlink (filename : chars) return int
-     renames System.CRTL.unlink;
+   function unlink (filename : chars) return int;
 
    ---------------------
    -- Extra functions --
diff --git a/gcc/ada/libgnat/s-crtl.ads b/gcc/ada/libgnat/s-crtl.ads
index c3a3b6481db..56900a8756f 100644
--- a/gcc/ada/libgnat/s-crtl.ads
+++ b/gcc/ada/libgnat/s-crtl.ads
@@ -220,7 +220,8 @@ package System.CRTL is
    function ungetc (c : int; stream : FILEs) return int;
    pragma Import (C, ungetc, "ungetc");
 
-   function unlink (filename : chars) return int;
+   function unlink (filename : chars;
+     encoding : Filename_Encoding := Unspecified) return int;
    pragma Import (C, unlink, "__gnat_unlink");
 
    function open (filename : chars; oflag : int) return int;
diff --git a/gcc/ada/libgnat/s-fileio.adb b/gcc/ada/libgnat/s-fileio.adb
index 931b68a3d2e..f55cdc796a3 100644
--- a/gcc/ada/libgnat/s-fileio.adb
+++ b/gcc/ada/libgnat/s-fileio.adb
@@ -350,6 +350,7 @@ package body System.File_IO is
       declare
          Filename : aliased constant String := File.Name.all;
          Is_Temporary_File : constant Boolean := File.Is_Temporary_File;
+         Encoding : constant CRTL.Filename_Encoding := File.Encoding;
 
       begin
          Close (File_Ptr);
@@ -360,7 +361,7 @@ package body System.File_IO is
          --  it's a temporary file, then closing it already unlinked it.
 
          if not Is_Temporary_File then
-            if unlink (Filename'Address) = -1 then
+            if System.CRTL.unlink (Filename'Address, Encoding) = -1 then
                raise Use_Error with OS_Lib.Errno_Message;
             end if;
          end if;