|
@@ -496,7 +496,7 @@ begin
|
|
|
else
|
|
else
|
|
|
begin
|
|
begin
|
|
|
FM:=FileMode; FileMode:=0;
|
|
FM:=FileMode; FileMode:=0;
|
|
|
- EatIO; DosError:=0;
|
|
|
|
|
|
|
+ EatIO; Dos.DosError:=0;
|
|
|
Assign(f,FileName);
|
|
Assign(f,FileName);
|
|
|
{$I-}
|
|
{$I-}
|
|
|
Reset(f);
|
|
Reset(f);
|
|
@@ -506,7 +506,7 @@ begin
|
|
|
Close(f);
|
|
Close(f);
|
|
|
end;
|
|
end;
|
|
|
{$I+}
|
|
{$I+}
|
|
|
- if (EatIO<>0) or (DosError<>0) then T:=-1;
|
|
|
|
|
|
|
+ if (EatIO<>0) or (Dos.DosError<>0) then T:=-1;
|
|
|
FileMode:=FM;
|
|
FileMode:=FM;
|
|
|
end;
|
|
end;
|
|
|
GetFileTime:=T;
|
|
GetFileTime:=T;
|
|
@@ -1035,7 +1035,7 @@ var
|
|
|
Dir : SearchRec;
|
|
Dir : SearchRec;
|
|
|
begin
|
|
begin
|
|
|
Dos.FindFirst(FileName,Archive+ReadOnly,Dir);
|
|
Dos.FindFirst(FileName,Archive+ReadOnly,Dir);
|
|
|
- ExistsFile:=(DosError=0);
|
|
|
|
|
|
|
+ ExistsFile:=(Dos.DosError=0);
|
|
|
{$ifdef FPC}
|
|
{$ifdef FPC}
|
|
|
Dos.FindClose(Dir);
|
|
Dos.FindClose(Dir);
|
|
|
{$endif def FPC}
|
|
{$endif def FPC}
|
|
@@ -1046,7 +1046,7 @@ var
|
|
|
Dir : SearchRec;
|
|
Dir : SearchRec;
|
|
|
begin
|
|
begin
|
|
|
Dos.FindFirst(TrimEndSlash(DirName),Directory,Dir);
|
|
Dos.FindFirst(TrimEndSlash(DirName),Directory,Dir);
|
|
|
- ExistsDir:=(DosError=0);
|
|
|
|
|
|
|
+ ExistsDir:=(Dos.DosError=0);
|
|
|
{$ifdef FPC}
|
|
{$ifdef FPC}
|
|
|
Dos.FindClose(Dir);
|
|
Dos.FindClose(Dir);
|
|
|
{$endif def FPC}
|
|
{$endif def FPC}
|
|
@@ -1161,7 +1161,10 @@ BEGIN
|
|
|
END.
|
|
END.
|
|
|
{
|
|
{
|
|
|
$Log$
|
|
$Log$
|
|
|
- Revision 1.5 2000-10-31 22:35:56 pierre
|
|
|
|
|
|
|
+ Revision 1.6 2000-11-04 20:04:33 hajny
|
|
|
|
|
+ * wrong DosError was used under OS/2
|
|
|
|
|
+
|
|
|
|
|
+ Revision 1.5 2000/10/31 22:35:56 pierre
|
|
|
* New big merge from fixes branch
|
|
* New big merge from fixes branch
|
|
|
|
|
|
|
|
Revision 1.4 2000/10/28 17:20:42 hajny
|
|
Revision 1.4 2000/10/28 17:20:42 hajny
|
Tomas Hajny