1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
diff -cr topal-63.orig/Makefile topal-63.cyg/Makefile
*** topal-63.orig/Makefile Sun Aug 31 16:28:25 2008
--- topal-63.cyg/Makefile Wed Sep 3 08:06:11 2008
***************
*** 83,89 ****
./mkhelp
README.txt: README.html
! lynx -dont_wrap_pre -dump README.html > README.txt
install: all
install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
--- 83,89 ----
./mkhelp
README.txt: README.html
! -lynx -dont_wrap_pre -dump README.html > README.txt
install: all
install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
***************
*** 102,107 ****
--- 102,108 ----
distclean realclean: clean
-rm topal topal.gz topal.gz.asc topal-ps topal-ps.gz topal-ps.gz.asc README.txt topal-package*.{tgz,tgz.sig,tgz.asc} *~
+ -rm topal.exe
-rm -rf www www.bak
make -C MIME-tool realclean
diff -cr topal-63.orig/misc.adb topal-63.cyg/misc.adb
*** topal-63.orig/misc.adb Sun Aug 31 16:28:25 2008
--- topal-63.cyg/misc.adb Wed Sep 3 07:59:31 2008
***************
*** 16,23 ****
with Ada.Characters.Latin_1;
with Ada.Command_Line;
with Ada.Integer_Text_IO;
- with Ada.Interrupts;
- with Ada.Interrupts.Names;
with Ada.IO_Exceptions;
with Ada.Strings;
with Ada.Strings.Fixed;
--- 16,21 ----
***************
*** 496,523 ****
raise;
end Hex_Decode;
- -- Handle signals.
- Default_Sigint_Handler : Ada.Interrupts.Parameterless_Handler;
- protected body Signal_Handlers is
-
- procedure Sigint_Handler is
- begin
- Ada.Text_IO.Put_Line("User interrupt!");
- Sigint_Pending_Flag := True;
- raise User_Interrupt;
- end Sigint_Handler;
-
- function Sigint_Pending return Boolean is
- begin
- return Sigint_Pending_Flag;
- end Sigint_Pending;
-
- end Signal_Handlers;
-
procedure Set_Sigint_Handler is
begin
! Ada.Interrupts.Attach_Handler(Signal_Handlers.Sigint_Handler'Access,
! Ada.Interrupts.Names.SIGINT);
exception
when others =>
Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
--- 494,502 ----
raise;
end Hex_Decode;
procedure Set_Sigint_Handler is
begin
! null;
exception
when others =>
Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
***************
*** 525,530 ****
raise;
end Set_Sigint_Handler;
- begin
- Default_Sigint_Handler := Ada.Interrupts.Current_Handler(Ada.Interrupts.Names.SIGINT);
end Misc;
--- 504,507 ----
diff -cr topal-63.orig/misc.ads topal-63.cyg/misc.ads
*** topal-63.orig/misc.ads Sun Aug 31 16:28:25 2008
--- topal-63.cyg/misc.ads Wed Sep 3 07:59:42 2008
***************
*** 96,113 ****
-- Hexadecimal decoder.
function Hex_Decode (S : in String) return Natural;
- -- We turn SIGINT into an exception so that we can clean up
- -- temporary files.
- -- Handle interrupts, SIGINT, etc.
- pragma Unreserve_All_Interrupts;
- -- because we want to be able to handle ctrl-C.
- protected Signal_Handlers is
- procedure Sigint_Handler;
- function Sigint_Pending return Boolean;
- pragma Interrupt_Handler(Sigint_Handler);
- private
- Sigint_Pending_Flag : Boolean := False;
- end Signal_Handlers;
-- And a procedure for taking over sigint.
procedure Set_Sigint_Handler;
--- 96,101 ----
diff -cr topal-63.orig/remote_mode.adb topal-63.cyg/remote_mode.adb
*** topal-63.orig/remote_mode.adb Sun Aug 31 16:28:25 2008
--- topal-63.cyg/remote_mode.adb Wed Sep 3 08:02:32 2008
***************
*** 382,388 ****
Server_Trigger_Loop:
loop
exit Server_Trigger_Loop when Test_F(Server_Trigger);
- exit Server_Main_Loop when Misc.Signal_Handlers.Sigint_Pending;
delay 0.5;
end loop Server_Trigger_Loop;
delay 0.1;
--- 382,387 ----
|
