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

* file handling related fixes

Browse Source
This commit is contained in:
Tomas Hajny 2003-10-25 22:45:37 +00:00
parent 22e50d1f63
commit 7adcc315bc
4 changed files with 102 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
rtl/emx/dos.pas
View File

@ -256,51 +256,43 @@ begin
end;
end;
procedure getftime(var f;var time:longint);
begin
asm
pushl %ebx
{Load handle}
movl f,%ebx
movl (%ebx),%ebx
{Get date}
movw $0x5700,%ax
call syscall
shll $16,%edx
movw %cx,%dx
movl time,%ebx
movl %edx,(%ebx)
xorb %ah,%ah
movw %ax,doserror
popl %ebx
end ['eax', 'ecx', 'edx'];
end;
procedure GetFTime (var F; var Time: longint); assembler;
asm
pushl %ebx
{Load handle}
movl F,%ebx
movl (%ebx),%ebx
{Get date}
movw $0x5700,%ax
call syscall
shll $16,%edx
movw %cx,%dx
movl Time,%ebx
movl %edx,(%ebx)
movw %ax,DosError
popl %ebx
end {['eax', 'ecx', 'edx']};
procedure SetFTime (var F; Time: longint);
var FStat: PFileStatus3;
RC: longint;
var FStat: TFileStatus3;
RC: cardinal;
begin
if os_mode = osOS2 then
begin
New (FStat);
RC := DosQueryFileInfo (FileRec (F).Handle, ilStandard, FStat,
SizeOf (FStat^));
if RC = 0 then
begin
FStat^.DateLastAccess := Hi (Time);
FStat^.DateLastWrite := Hi (Time);
FStat^.TimeLastAccess := Lo (Time);
FStat^.TimeLastWrite := Lo (Time);
RC := DosSetFileInfo (FileRec (F).Handle, ilStandard,
FStat, SizeOf (FStat^));
end;
DosError := integer(RC);
Dispose (FStat);
begin
RC := DosQueryFileInfo (FileRec (F).Handle, ilStandard, @FStat,
SizeOf (FStat));
if RC = 0 then
begin
FStat.DateLastAccess := Hi (Time);
FStat.DateLastWrite := Hi (Time);
FStat.TimeLastAccess := Lo (Time);
FStat.TimeLastWrite := Lo (Time);
RC := DosSetFileInfo (FileRec (F).Handle, ilStandard,
@FStat, SizeOf (FStat));
end;
DosError := integer (RC);
end
else
asm
@ -313,7 +305,6 @@ begin
{Set date}
movw $0x5701,%ax
call syscall
xorb %ah,%ah
movw %ax,doserror
popl %ebx
end ['eax', 'ecx', 'edx'];
@ -698,7 +689,7 @@ begin
function DiskFree (Drive: byte): int64;
var FI: TFSinfo;
RC: longint;
RC: cardinal;
begin
if (os_mode = osDOS) or (os_mode = osDPMI) then
@ -739,7 +730,7 @@ end;
function DiskSize (Drive: byte): int64;
var FI: TFSinfo;
RC: longint;
RC: cardinal;
begin
if (os_mode = osDOS) or (os_mode = osDPMI) then
@ -1234,7 +1225,10 @@ begin
end.
{
$Log$
Revision 1.6 2003-10-07 21:33:24 hajny
Revision 1.7 2003-10-25 22:45:37 hajny
* file handling related fixes
Revision 1.6 2003/10/07 21:33:24 hajny
* stdcall fixes and asm routines cleanup
Revision 1.5 2003/10/04 17:53:08 hajny

19
rtl/emx/system.pas
View File

@ -639,13 +639,15 @@ begin
popl %ebx
end ['eax', 'ecx', 'edx'];
{ for systems that have more handles }
if FileRec (F).Handle > FileHandleCount then
FileHandleCount := FileRec (F).Handle;
if ((Flags and $100) <> 0) and
(FileRec (F).Handle <> UnusedHandle) then
if (FileRec (F).Handle <> UnusedHandle) then
begin
do_seekend (FileRec (F).Handle);
FileRec (F).Mode := fmOutput; {fool fmappend}
if (FileRec (F).Handle > FileHandleCount) then
FileHandleCount := FileRec (F).Handle;
if ((Flags and $100) <> 0) then
begin
do_seekend (FileRec (F).Handle);
FileRec (F).Mode := fmOutput; {fool fmappend}
end;
end;
end;
@ -1263,7 +1265,10 @@ begin
end.
{
$Log$
Revision 1.17 2003-10-19 12:13:41 hajny
Revision 1.18 2003-10-25 22:45:37 hajny
* file handling related fixes
Revision 1.17 2003/10/19 12:13:41 hajny
* UnusedHandle value made the same as with other targets
Revision 1.16 2003/10/19 09:35:28 hajny

88
rtl/os2/dos.pas
View File

@ -202,35 +202,32 @@ end;
procedure getftime(var f;var time:longint);
var
FStat: PFileStatus3;
FStat: TFileStatus3;
begin
New (FStat);
DosError:=DosQueryFileInfo(FileRec(F).Handle, 1, FStat, SizeOf(FStat^));
DosError := DosQueryFileInfo (FileRec (F).Handle, ilStandard, @FStat,
SizeOf (FStat));
If DosError=0 then
Time:=FStat^.timelastwrite+FStat^.DateLastWrite*256
Time := FStat.TimeLastWrite + FStat.DateLastWrite * 256
else
Time:=0;
Dispose (FStat);
end;
procedure SetFTime (var F; Time: longint);
var FStat: PFileStatus3;
RC: longint;
var FStat: TFileStatus3;
RC: cardinal;
begin
New (FStat);
RC := DosQueryFileInfo (FileRec (F).Handle, ilStandard, @FStat,
SizeOf (FStat));
SizeOf (FStat));
if RC = 0 then
begin
FStat^.DateLastAccess := Hi (Time);
FStat^.DateLastWrite := Hi (Time);
FStat^.TimeLastAccess := Lo (Time);
FStat^.TimeLastWrite := Lo (Time);
RC := DosSetFileInfo (FileRec (F).Handle, ilStandard,
FStat, SizeOf (FStat^));
FStat.DateLastAccess := Hi (Time);
FStat.DateLastWrite := Hi (Time);
FStat.TimeLastAccess := Lo (Time);
FStat.TimeLastWrite := Lo (Time);
RC := DosSetFileInfo (FileRec (F).Handle, ilStandard, FStat,
SizeOf (FStat));
end;
DosError := integer(RC);
Dispose (FStat);
DosError := integer (RC);
end;
procedure exec(const path:pathstr;const comline:comstr);
@ -320,7 +317,7 @@ begin
end ['eax','ebx','ecx','edx','esi','edi'];
//Not clear how to use
exec:=DosExecPgm(ObjName, Longint(runflags), Args, Env, Res, Path);
exec:=DosExecPgm(ObjName, RunFlags, Args, Env, Res, Path);
freemem(args,ArgsSize);
FreeMem(env, envc*sizeof(pchar)+16384);
@ -404,7 +401,7 @@ end;
function DiskFree (Drive: byte): int64;
var FI: TFSinfo;
RC: longint;
RC: cardinal;
begin
{In OS/2, we use the filesystem information.}
RC := DosQueryFSInfo (Drive, 1, FI, SizeOf (FI));
@ -417,7 +414,7 @@ end;
function DiskSize (Drive: byte): int64;
var FI: TFSinfo;
RC: longint;
RC: cardinal;
begin
RC := DosQueryFSinfo (Drive, 1, FI, SizeOf (FI));
if RC = 0 then
@ -433,10 +430,6 @@ begin
end;
procedure DosSearchRec2SearchRec (var F: SearchRec);
const
NameSize=255;
var
L, I: longint;
type
TRec = record
T, D: word;
@ -455,8 +448,7 @@ end;
procedure FindFirst (const Path: PathStr; Attr: word; var F: SearchRec);
var path0: array[0..255] of char;
Count: cardinal;
var Count: cardinal;
begin
{No error.}
@ -634,9 +626,6 @@ function FExpand (const Path: PathStr): PathStr;
{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
{$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
const
LFNSupport = true;
{$I fexpand.inc}
{$UNDEF FPC_FEXPAND_DRIVES}
@ -678,37 +667,42 @@ begin
d.year:=time+1980;
end;
procedure getfattr(var f;var attr : word);
procedure GetFAttr (var F; var Attr: word);
var
PathInfo: PFileStatus3;
PathInfo: TFileStatus3;
RC: cardinal;
begin
New (PathInfo);
Attr:=0;
DosError:=DosQueryPathInfo(FileRec(F).Name, ilStandard, PathInfo, SizeOf(PathInfo^));
if DosError=0 then
Attr := PathInfo^.attrFile;
Dispose (PathInfo);
Attr := 0;
RC := DosQueryPathInfo (FileRec (F).Name, ilStandard,
@PathInfo, SizeOf (PathInfo));
DosError := integer (RC);
if RC = 0 then
Attr := PathInfo.AttrFile;
end;
procedure setfattr(var f;attr : word);
procedure SetFAttr (var F; Attr: word);
var
PathInfo: PFileStatus3;
PathInfo: TFileStatus3;
RC: cardinal;
begin
New (PathInfo);
DosError:=DosQueryPathInfo(FileRec(F).Name, ilStandard, PathInfo, SizeOf(PathInfo^));
if DosError=0 then
RC := DosQueryPathInfo (FileRec (F).Name, ilStandard,
@PathInfo, SizeOf (PathInfo));
if RC = 0 then
begin
PathInfo^.attrFile:=Attr;
DosError:=DosSetPathInfo(FileRec(F).Name, ilStandard, PathInfo, SizeOf(PathInfo^), doWriteThru);
PathInfo.AttrFile := Attr;
RC := DosSetPathInfo (FileRec (F).Name, ilStandard, @PathInfo,
SizeOf (PathInfo), doWriteThru);
end;
Dispose (PathInfo);
DosError := integer (RC);
end;
begin
end.
{
$Log$
Revision 1.28 2003-10-05 22:06:43 hajny
Revision 1.29 2003-10-25 22:45:37 hajny
* file handling related fixes
Revision 1.28 2003/10/05 22:06:43 hajny
* result buffers must be allocated
Revision 1.27 2003/10/03 21:46:41 peter

19
rtl/os2/system.pas
View File

@ -765,13 +765,15 @@ begin
popl %ebx
end ['eax', 'ecx', 'edx'];
{ for systems that have more handles }
if FileRec (F).Handle > FileHandleCount then
FileHandleCount := FileRec (F).Handle;
if ((Flags and $100) <> 0) and
(FileRec (F).Handle <> UnusedHandle) then
if (FileRec (F).Handle <> UnusedHandle) then
begin
do_seekend (FileRec (F).Handle);
FileRec (F).Mode := fmOutput; {fool fmappend}
if (FileRec (F).Handle > FileHandleCount) then
FileHandleCount := FileRec (F).Handle;
if ((Flags and $100) <> 0) then
begin
do_seekend (FileRec (F).Handle);
FileRec (F).Mode := fmOutput; {fool fmappend}
end;
end;
end;
@ -1179,7 +1181,10 @@ begin
end.
{
$Log$
Revision 1.51 2003-10-19 12:13:41 hajny
Revision 1.52 2003-10-25 22:45:37 hajny
* file handling related fixes
Revision 1.51 2003/10/19 12:13:41 hajny
* UnusedHandle value made the same as with other targets
Revision 1.50 2003/10/19 09:37:00 hajny