paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-10 11:32:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix error in last commit for quoted args.

Browse Source 
end_of_args needs to be reset for even if
    curent_arg is empty.

git-svn-id: trunk@18160 -
This commit is contained in:
pierre 2011-08-10 15:34:08 +00:00
parent 1dfa5c2e74
commit 59720fa55a
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rtl/go32v2/dos.pp
View File

@ -312,21 +312,26 @@ var
current_arg:=current_arg+c[i];
if i=length(c) then
end_of_arg:=true;
if end_of_arg and (current_arg<>'') then
if end_of_arg then
begin
if proxy_argc>MAX_ARGS then
{ Allow empty args using "" or '' }
if (current_arg<>'') or (quote<>#0) then
begin
writeln(stderr,'Too many arguments in Dos.exec');
RunError(217);
if proxy_argc>MAX_ARGS then
begin
writeln(stderr,'Too many arguments in Dos.exec');
RunError(217);
end;
la_argv_ofs[proxy_argc]:=current_dos_buffer_pos-la_proxy_seg*16;
{$ifdef DEBUG_PROXY}
writeln(stderr,'arg ',proxy_argc,'="',current_arg,'"');
{$endif DEBUG_PROXY}
paste_to_dos(current_arg,false,false);
inc(proxy_argc);
quote:=#0;
current_arg:='';
end;
la_argv_ofs[proxy_argc]:=current_dos_buffer_pos-la_proxy_seg*16;
{$ifdef DEBUG_PROXY}
writeln(stderr,'arg ',proxy_argc,'="',current_arg,'"');
{$endif DEBUG_PROXY}
paste_to_dos(current_arg,false,false);
inc(proxy_argc);
quote:=#0;
current_arg:='';
{ Always reset end_of_arg boolean }
end_of_arg:=false;
end;
end;