Przeglądaj źródła

* cleanup of previous stuff

git-svn-id: trunk@5619 -
Almindor 18 lat temu
rodzic
commit
a21e39ae16
1 zmienionych plików z 8 dodań i 11 usunięć
  1. 8 11
      fcl/unix/process.inc

+ 8 - 11
fcl/unix/process.inc

@@ -248,7 +248,7 @@ Var
   FEnv     : PPChar;
   FEnv     : PPChar;
   Argv     : PPChar;
   Argv     : PPChar;
   fd       : Integer;
   fd       : Integer;
-  PName,p2    : String;
+  PName    : String;
 
 
 begin
 begin
   If (poUsePipes in FProcessOptions) then
   If (poUsePipes in FProcessOptions) then
@@ -271,16 +271,13 @@ begin
             PName:=CommandLine;
             PName:=CommandLine;
           end;
           end;
           
           
-        if not FileExists(PName) then
-          P2 := FileSearch(Pname,fpgetenv('PATH'))
-        else
-          P2 := PName;
-          
-        If (P2='') then
-          Raise EProcess.CreateFmt(SErrNoSuchProgram,[PName])
-        else
-          PName:=P2;  
-          
+        if not FileExists(PName) then begin
+          PName := FileSearch(Pname,fpgetenv('PATH'));
+
+          if Length(PName) = 0 then
+            raise EProcess.CreateFmt(SErrNoSuchProgram,[PName]);
+        end;
+      
         Pid:=fpfork;
         Pid:=fpfork;
         if Pid<0 then
         if Pid<0 then
           Raise EProcess.Create('Failed to Fork process');
           Raise EProcess.Create('Failed to Fork process');