g-comlin.adb (Getopt): Fix handling of "*" switch when not collapsing switches.
2007-08-14 Emmanuel Briot <briot@adacore.com> * g-comlin.adb (Getopt): Fix handling of "*" switch when not collapsing switches. From-SVN: r127451
This commit is contained in:
parent
154c16575f
commit
171d182e7f
@ -581,6 +581,17 @@ package body GNAT.Command_Line is
|
|||||||
-- If Concatenate is False and the full argument is not
|
-- If Concatenate is False and the full argument is not
|
||||||
-- recognized as a switch, this is an invalid switch.
|
-- recognized as a switch, this is an invalid switch.
|
||||||
|
|
||||||
|
if Switches (Switches'First) = '*' then
|
||||||
|
Set_Parameter
|
||||||
|
(The_Switch,
|
||||||
|
Arg_Num => Current_Argument,
|
||||||
|
First => 1,
|
||||||
|
Last => CL.Argument (Current_Argument)'Last);
|
||||||
|
Is_Switch (Current_Argument) := True;
|
||||||
|
Dummy := Goto_Next_Argument_In_Section;
|
||||||
|
return '*';
|
||||||
|
end if;
|
||||||
|
|
||||||
Set_Parameter (The_Switch,
|
Set_Parameter (The_Switch,
|
||||||
Arg_Num => Current_Argument,
|
Arg_Num => Current_Argument,
|
||||||
First => Current_Index,
|
First => Current_Index,
|
||||||
@ -597,6 +608,17 @@ package body GNAT.Command_Line is
|
|||||||
-- If Concatenate is False and the full argument is not
|
-- If Concatenate is False and the full argument is not
|
||||||
-- recognized as a switch, this is an invalid switch.
|
-- recognized as a switch, this is an invalid switch.
|
||||||
|
|
||||||
|
if Switches (Switches'First) = '*' then
|
||||||
|
Set_Parameter
|
||||||
|
(The_Switch,
|
||||||
|
Arg_Num => Current_Argument,
|
||||||
|
First => 1,
|
||||||
|
Last => CL.Argument (Current_Argument)'Last);
|
||||||
|
Is_Switch (Current_Argument) := True;
|
||||||
|
Dummy := Goto_Next_Argument_In_Section;
|
||||||
|
return '*';
|
||||||
|
end if;
|
||||||
|
|
||||||
Set_Parameter (The_Switch,
|
Set_Parameter (The_Switch,
|
||||||
Arg_Num => Current_Argument,
|
Arg_Num => Current_Argument,
|
||||||
First => Current_Index,
|
First => Current_Index,
|
||||||
|
Loading…
Reference in New Issue
Block a user