* changed sysutils.exec to ExecuteProcess

compiler/utils/fpc.pp

@@ -164,21 +164,21 @@ program fpc;
      findexe(ppcbin);
 
      { call ppcXXX }
-     swapvectors;
-     {$ifdef unix}
-     errorvalue:=SysUtils.exec(ppcbin,ppccommandline);
-     {$else}
-     Dos.exec(ppcbin,ppccommandline);
-     errorvalue:=doserror;
-     {$endif}
-     swapvectors;
+     try
+       errorvalue:=ExecuteProcess(ppcbin,ppccommandline);
+     except
+       error(ppcbin+' can''t be executed');
+     end;
      if errorvalue<>0 then
        error(ppcbin+' can''t be executed');
      halt(dosexitcode);
   end.
 {
   $Log$
-  Revision 1.10  2004-01-03 09:20:45  marco
+  Revision 1.11  2004-01-05 22:41:20  florian
+    * changed sysutils.exec to ExecuteProcess
+
+  Revision 1.10  2004/01/03 09:20:45  marco
    * errorhandling fixed
 
   Revision 1.9  2004/01/03 09:12:23  marco

rtl/objpas/sysutils/osutilsh.inc

@@ -16,13 +16,14 @@
 { OS handling utilities }
 
 Function GetEnvironmentVariable(Const EnvVar : String) : String;
-{$ifdef HAS_EXEC_ANSI}	// define is temporarily.
-function Exec (Const Path: AnsiString; Const ComLine: AnsiString):integer;  
-{$endif}
+function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer;
 
 {
   $Log$
-  Revision 1.2  2004-01-03 08:55:58  marco
+  Revision 1.3  2004-01-05 22:37:24  florian
+    * changed sysutils.exec to ExecuteProcess
+
+  Revision 1.2  2004/01/03 08:55:58  marco
    * Exec(ansistring) function
 
   Revision 1.1  2003/10/06 21:01:06  peter

rtl/objpas/sysutils/sysutilh.inc

@@ -150,6 +150,11 @@ type
 
    EPackageError = class(Exception);
 
+   EOSError = class(Exception)
+   public
+     ErrorCode: DWORD;
+   end;
+   
    ESafecallException = class(Exception);
    ENoThreadSupport = Class(Exception);
 
@@ -226,7 +231,10 @@ Type
 
 {
   $Log$
-  Revision 1.5  2003-11-26 22:17:42  michael
+  Revision 1.6  2004-01-05 22:37:24  florian
+    * changed sysutils.exec to ExecuteProcess
+
+  Revision 1.5  2003/11/26 22:17:42  michael
   + Merged fixbranch fixes, missing in main branch
 
   Revision 1.4  2003/11/26 20:12:08  michael

rtl/unix/sysutils.pp

@@ -478,36 +478,43 @@ begin
   Result:=StrPas(BaseUnix.FPGetenv(PChar(EnvVar)));
 end;
 
-function Exec (Const Path: AnsiString; Const ComLine: AnsiString):integer;
+function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString):integer;
 var
   pid    : longint;
   err    : longint;
-  // The Error-Checking in the previous Version failed, since halt($7F) gives an WaitPid-status of $7
+  e : EOSError;
+  
 Begin
   pid:=fpFork;
   if pid=0 then
    begin
    {The child does the actual exec, and then exits}
      if ComLine='' then
-      Execl(Path)
+       Execl(Path)
      else
-      Execl(Path+' '+ComLine);
-   {If the execve fails, we return an exitvalue of 127, to let it be known}
+       Execl(Path+' '+ComLine);
+     { If the execve fails, we return an exitvalue of 127, to let it be known}
      fpExit(127);
    end
   else
    if pid=-1 then         {Fork failed}
     begin
-      result:=8;
-      exit
+      e:=EOSError.CreateFmt('Failed to execute %s : %d',[CommandLine,-1]);
+      e.ErrorCode:=-1;
+      raise e;
     end;
-{We're in the parent, let's wait.}
+    
+  { We're in the parent, let's wait. }
   result:=WaitProcess(pid); // WaitPid and result-convert
 
   if (result>=0) and (result<>127) then
-   result:=0
+    result:=0
   else
-   result:=8; // perhaps one time give an better error
+    begin
+      e:=EOSError.CreateFmt('Failed to execute %s : %d',[CommandLine,result]);
+      e.ErrorCode:=result;
+      raise e;
+    end;
 End;
 
 
@@ -524,7 +531,10 @@ end.
 {
 
   $Log$
-  Revision 1.27  2004-01-03 09:09:11  marco
+  Revision 1.28  2004-01-05 22:37:15  florian
+    * changed sysutils.exec to ExecuteProcess
+
+  Revision 1.27  2004/01/03 09:09:11  marco
    * Unix exec(ansistring)
 
   Revision 1.26  2003/11/26 20:35:14  michael