paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 02:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* exec fix

Browse Source
This commit is contained in:
Tomas Hajny 2004-03-08 22:31:00 +00:00
parent abbd54f334
commit 42490a4c63
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rtl/emx/dos.pas
View File

@ -92,6 +92,7 @@ Type
execwinflags=(efdefault,efminimize,efmaximize,effullscreen, execwinflags=(efdefault,efminimize,efmaximize,effullscreen,
efwindowed); efwindowed);
{OS/2 specific functions} {OS/2 specific functions}
function GetEnvPChar (EnvVar: string): PChar; function GetEnvPChar (EnvVar: string): PChar;
@ -336,15 +337,6 @@ procedure exec(const path:pathstr;const comline:comstr);
{Execute a program.} {Execute a program.}
begin
LastDosExitCode := Exec (Path, ExecRunFlags (ExecFlags), efdefault, comline);
end;
function exec(path:pathstr;runflags:execrunflags;winflags:execwinflags;
const comline:comstr):longint;
{Execute a program. More suitable for OS/2 than the exec above.}
type bytearray=array[0..8191] of byte; type bytearray=array[0..8191] of byte;
Pbytearray=^bytearray; Pbytearray=^bytearray;
@ -359,11 +351,12 @@ type bytearray=array[0..8191] of byte;
sizearg : word; { size of arguments } sizearg : word; { size of arguments }
numenv : word; { number of env strings } numenv : word; { number of env strings }
sizeenv:word; { size of environment } sizeenv:word; { size of environment }
mode1,mode2:byte; { mode byte } mode:word; { mode word }
end; end;
var args:Pbytearray; var args:Pbytearray;
env:Pbytearray; env:Pbytearray;
Path2:PByteArray;
i,argsize:word; i,argsize:word;
es:execstruc; es:execstruc;
esadr:pointer; esadr:pointer;
@ -378,6 +371,7 @@ const
begin begin
getmem(args,ArgsSize); getmem(args,ArgsSize);
GetMem(env, envc*sizeof(pchar)+16384); GetMem(env, envc*sizeof(pchar)+16384);
GetMem (Path2, 260);
{Now setup the arguments. The first argument should be the program {Now setup the arguments. The first argument should be the program
name without directory and extension.} name without directory and extension.}
fsplit(path,d,n,e); fsplit(path,d,n,e);
@ -445,25 +439,16 @@ begin
es.argofs:=args; es.argofs:=args;
es.envofs:=env; es.envofs:=env;
es.numenv:=envc; es.numenv:=envc;
{ set an error - path is too long } Move (Path [1], Path2^, Length (Path));
{ since we must add a zero to the } Path2^ [Length (Path)] := 0;
{ end. } es.nameofs := Path2;
if length(path) > 254 then
begin
exec := 8;
exit;
end;
path[length(path)+1] := #0;
es.nameofs:=pointer(longint(@path)+1);
asm asm
movw %ss,es.argseg movw %ss,es.argseg
movw %ss,es.envseg movw %ss,es.envseg
movw %ss,es.nameseg movw %ss,es.nameseg
end; end;
es.sizearg:=argsize; es.sizearg:=argsize;
{Typecasting of sets in FPC is a bit hard.} es.mode := word (ExecFlags);
es.mode1:=byte(runflags);
es.mode2:=byte(winflags);
{Now exec the program.} {Now exec the program.}
asm asm
@ -477,11 +462,12 @@ begin
decl %eax decl %eax
.Lexprg1: .Lexprg1:
movw %di,doserror movw %di,doserror
movl %eax,__RESULT movl %eax, LastDosExitCode
end ['eax', 'ebx', 'ecx', 'edx', 'esi', 'edi']; end ['eax', 'ebx', 'ecx', 'edx', 'esi', 'edi'];
freemem(args,ArgsSize); FreeMem (Path2, 260);
FreeMem(env, envc*sizeof(pchar)+16384); FreeMem(env, envc*sizeof(pchar)+16384);
freemem(args,ArgsSize);
{Phew! That's it. This was the most sophisticated procedure to call {Phew! That's it. This was the most sophisticated procedure to call
a system function I ever wrote!} a system function I ever wrote!}
end; end;
@ -1217,7 +1203,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.13 2004-02-22 15:01:49 hajny Revision 1.14 2004-03-08 22:31:00 hajny
* exec fix
Revision 1.13 2004/02/22 15:01:49 hajny
* lots of fixes (regcall, THandle, string operations in sysutils, longint2cardinal according to OS/2 docs, dosh.inc, ...) * lots of fixes (regcall, THandle, string operations in sysutils, longint2cardinal according to OS/2 docs, dosh.inc, ...)
Revision 1.12 2004/02/17 17:37:26 daniel Revision 1.12 2004/02/17 17:37:26 daniel