Răsfoiți Sursa

* Fix bug #29772

git-svn-id: trunk@33151 -
michael 9 ani în urmă
părinte
comite
4ed0c07ea3
1 a modificat fișierele cu 6 adăugiri și 8 ștergeri
  1. 6 8
      utils/instantfpc/instantfpc.pas

+ 6 - 8
utils/instantfpc/instantfpc.pas

@@ -29,9 +29,11 @@ const
   // 1.3 compile in a separate directory, so that parallel invocations do not overwrite link.res files
   // 1.3 compile in a separate directory, so that parallel invocations do not overwrite link.res files
 
 
 
 
-Procedure Usage;
+Procedure Usage(Err : string);
 
 
 begin
 begin
+  if (Err<>'') then
+    Writeln('Error : ',Err);
   writeln('instantfpc '+Version);
   writeln('instantfpc '+Version);
   writeln;
   writeln;
   writeln('Run pascal source files as scripts.');
   writeln('Run pascal source files as scripts.');
@@ -76,7 +78,7 @@ begin
   writeln;
   writeln;
   writeln('  -B');
   writeln('  -B');
   writeln('      Always recompile.');
   writeln('      Always recompile.');
-  Halt(0);
+  Halt(Ord(Err<>''));
 end;
 end;
 
 
 Procedure DisplayCache;
 Procedure DisplayCache;
@@ -108,7 +110,7 @@ begin
     Halt(1);
     Halt(1);
     end
     end
   else if p='-h' then 
   else if p='-h' then 
-    usage
+    usage('')
   else if p='--get-cache' then 
   else if p='--get-cache' then 
     DisplayCache
     DisplayCache
   else if copy(p,1,11)='--compiler=' then 
   else if copy(p,1,11)='--compiler=' then 
@@ -167,12 +169,8 @@ begin
       end;  
       end;  
   end;
   end;
   if (Filename='') then 
   if (Filename='') then 
-    begin
-    writeln('missing source file');
-    Halt(1);
-    end;
+    Usage('Missing source file');
   CheckSourceName(Filename);
   CheckSourceName(Filename);
-
   Src:=TStringList.Create;
   Src:=TStringList.Create;
   try
   try
     Src.LoadFromFile(Filename);
     Src.LoadFromFile(Filename);