o update to 1.1.p (remove unnecessary patches)
PR: 29095 Submitted by: MAINTAINER
This commit is contained in:
parent
64cbd2a6e8
commit
6a200eeec9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=49231
@ -1,87 +0,0 @@
|
||||
--- osint.ads.orig Tue Apr 4 20:28:14 2000
|
||||
+++ osint.ads Tue Apr 4 20:28:42 2000
|
||||
@@ -227,15 +227,6 @@
|
||||
-- Type used to return a String_Access_List without dragging in secondary
|
||||
-- stack.
|
||||
|
||||
- function To_Canonical_File_List
|
||||
- (Wildcard_Host_File : String; Only_Dirs : Boolean)
|
||||
- return String_Access_List_Access;
|
||||
- -- Expand a wildcard host syntax file or directory specification (e.g. on
|
||||
- -- a VMS host, any file or directory spec that contains:
|
||||
- -- "*", or "%", or "...")
|
||||
- -- and return a list of valid Unix syntax file or directory specs.
|
||||
- -- If Only_Dirs is True, then only return directories.
|
||||
-
|
||||
function To_Canonical_Dir_Spec
|
||||
(Host_Dir : String;
|
||||
Prefix_Style : Boolean)
|
||||
--- osint.adb.orig Tue Apr 4 20:28:22 2000
|
||||
+++ osint.adb Tue Apr 4 20:28:58 2000
|
||||
@@ -2333,66 +2333,6 @@
|
||||
end Time_From_Last_Bind;
|
||||
|
||||
---------------------------
|
||||
- -- To_Canonical_File_List --
|
||||
- ---------------------------
|
||||
-
|
||||
- function To_Canonical_File_List
|
||||
- (Wildcard_Host_File : String;
|
||||
- Only_Dirs : Boolean)
|
||||
- return String_Access_List_Access
|
||||
- is
|
||||
- function To_Canonical_File_List_Init
|
||||
- (Host_File : Address;
|
||||
- Only_Dirs : Integer)
|
||||
- return Integer;
|
||||
- pragma Import (C, To_Canonical_File_List_Init,
|
||||
- "to_canonical_file_list_init");
|
||||
-
|
||||
- function To_Canonical_File_List_Next return Address;
|
||||
- pragma Import (C, To_Canonical_File_List_Next,
|
||||
- "to_canonical_file_list_next");
|
||||
-
|
||||
- procedure To_Canonical_File_List_Free;
|
||||
- pragma Import (C, To_Canonical_File_List_Free,
|
||||
- "to_canonical_file_list_free");
|
||||
-
|
||||
- Num_Files : Integer;
|
||||
- C_Wildcard_Host_File : String (1 .. Wildcard_Host_File'Length + 1);
|
||||
-
|
||||
- begin
|
||||
- C_Wildcard_Host_File (1 .. Wildcard_Host_File'Length) :=
|
||||
- Wildcard_Host_File;
|
||||
- C_Wildcard_Host_File (C_Wildcard_Host_File'Last) := ASCII.NUL;
|
||||
-
|
||||
- -- Do the expansion and say how many there are
|
||||
-
|
||||
- Num_Files := To_Canonical_File_List_Init
|
||||
- (C_Wildcard_Host_File'Address, Boolean'Pos (Only_Dirs));
|
||||
-
|
||||
- declare
|
||||
- Canonical_File_List : String_Access_List (1 .. Num_Files);
|
||||
- Canonical_File_Addr : Address;
|
||||
- Canonical_File_Len : Integer;
|
||||
-
|
||||
- begin
|
||||
- -- Retrieve the expanded directoy names and build the list
|
||||
-
|
||||
- for J in 1 .. Num_Files loop
|
||||
- Canonical_File_Addr := To_Canonical_File_List_Next;
|
||||
- Canonical_File_Len := C_String_Length (Canonical_File_Addr);
|
||||
- Canonical_File_List (J) := To_Path_String_Access
|
||||
- (Canonical_File_Addr, Canonical_File_Len);
|
||||
- end loop;
|
||||
-
|
||||
- -- Free up the storage
|
||||
-
|
||||
- To_Canonical_File_List_Free;
|
||||
-
|
||||
- return new String_Access_List'(Canonical_File_List);
|
||||
- end;
|
||||
- end To_Canonical_File_List;
|
||||
-
|
||||
- ---------------------------
|
||||
-- To_Canonical_Dir_Spec --
|
||||
---------------------------
|
||||
|
@ -1,31 +0,0 @@
|
||||
--- g-os_lib.adb.orig Tue Apr 4 20:32:52 2000
|
||||
+++ g-os_lib.adb Tue Apr 4 20:33:38 2000
|
||||
@@ -173,25 +173,11 @@
|
||||
(FD : out File_Descriptor;
|
||||
Name : out Temp_File_Name)
|
||||
is
|
||||
- function Get_Temp_Name (T : Address) return Address;
|
||||
- pragma Import (C, Get_Temp_Name, "mktemp");
|
||||
-
|
||||
- function Open_New_Temp
|
||||
- (Name : System.Address;
|
||||
- Fmode : Mode)
|
||||
- return File_Descriptor;
|
||||
- pragma Import (C, Open_New_Temp, "open_new_temp");
|
||||
-
|
||||
+ function Get_Temp_Name (T : Address) return File_Descriptor;
|
||||
+ pragma Import (C, Get_Temp_Name, "mkstemp");
|
||||
begin
|
||||
Name := "GNAT-XXXXXX" & ASCII.NUL;
|
||||
-
|
||||
- -- Check for NULL pointer returned by C
|
||||
-
|
||||
- if Get_Temp_Name (Name'Address) = Null_Address then
|
||||
- FD := -1;
|
||||
- else
|
||||
- FD := Open_New_Temp (Name'Address, Binary);
|
||||
- end if;
|
||||
+ FD := Get_Temp_Name (Name'Address);
|
||||
end Create_Temp_File;
|
||||
|
||||
-----------------
|
@ -1,38 +0,0 @@
|
||||
--- GNAT_libc.java.orig Tue Apr 4 20:52:26 2000
|
||||
+++ GNAT_libc.java Tue Apr 4 22:23:54 2000
|
||||
@@ -67,9 +67,10 @@
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
-import java.security.AccessControlException;
|
||||
+// import java.security.AccessControlException;
|
||||
|
||||
import java.util.Date;
|
||||
+import java.util.Calendar;
|
||||
import java.util.GregorianCalendar;
|
||||
|
||||
import jgnat.adalib.constraint_error;
|
||||
@@ -798,17 +799,13 @@
|
||||
|
||||
// char *tmpnam (char s[L_tmpnam])
|
||||
|
||||
- static public void tmpnam (Object s)
|
||||
- {
|
||||
- byte buf [] = (byte []) s;
|
||||
+ static public void tmpnam (Object s)
|
||||
+ {
|
||||
+ byte buf [] = (byte []) s;
|
||||
|
||||
- try {
|
||||
- copy (File.createTempFile ("JGNAT-", null).getCanonicalPath (), buf);
|
||||
- }
|
||||
- catch (IOException e) {
|
||||
- buf [0] = 0;
|
||||
- }
|
||||
- }
|
||||
+ copy ("JGNAT-" + (new GregorianCalendar()).get(Calendar.MILLISECOND),
|
||||
+ buf);
|
||||
+ }
|
||||
|
||||
// int ungetc (int c, FILE *stream)
|
||||
|
@ -1,23 +0,0 @@
|
||||
--- jvm_file.adb.orig Tue Jan 19 15:26:06 1999
|
||||
+++ jvm_file.adb Thu Mar 8 10:03:10 2001
|
||||
@@ -31,6 +31,9 @@
|
||||
with JVM_Walk;
|
||||
with Osint;
|
||||
|
||||
+-- add following to get rid of compile bug
|
||||
+with Ada.Characters.Handling;
|
||||
+
|
||||
package body JVM_File is
|
||||
|
||||
use Utf8;
|
||||
@@ -417,7 +420,9 @@
|
||||
if U in 16#01# .. 16#7F# then
|
||||
Add (T, U);
|
||||
else
|
||||
- Append (T, Wide_Character (C));
|
||||
+
|
||||
+ -- Change to To_Wide_Character from Ada.Characters.Handling
|
||||
+ Append (T, Ada.Characters.Handling.To_Wide_Character (C));
|
||||
end if;
|
||||
end Append;
|
||||
|
Loading…
Reference in New Issue
Block a user