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

* previous change broke PathConv, fixed

Browse Source
This commit is contained in:
Károly Balogh 2004-12-07 09:55:46 +00:00
parent 17f31e0ed3
commit 82d0728c5a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rtl/morphos/system.pp
View File

@ -62,6 +62,7 @@ var
MOS_heapPool : Pointer; { pointer for the OS pool for growing the heap } MOS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
MOS_origDir : LongInt; { original directory on startup } MOS_origDir : LongInt; { original directory on startup }
MOS_currDir : LongInt; { current directory handle }
MOS_ambMsg : Pointer; MOS_ambMsg : Pointer;
MOS_ConName : PChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT'; MOS_ConName : PChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
MOS_ConHandle: LongInt; MOS_ConHandle: LongInt;
@ -204,7 +205,7 @@ procedure haltproc(e:longint);cdecl;external name '_haltproc';
procedure System_exit; procedure System_exit;
begin begin
{ We must remove the CTRL-C FALG here because halt } { We must remove the CTRL-C FLAG here because halt }
{ may call I/O routines, which in turn might call } { may call I/O routines, which in turn might call }
{ halt, so a recursive stack crash } { halt, so a recursive stack crash }
if BreakOn then begin if BreakOn then begin
@ -399,9 +400,9 @@ var tmppos: longint;
begin begin
{ check for short paths } { check for short paths }
if length(path)<=2 then begin if length(path)<=2 then begin
if (path='.') or (path='./') then begin path:=''; exit; end; if (path='.') or (path='./') then path:='' else
if path='..' then begin path:='/'; exit; end; if path='..' then path:='/' else
if path='*' then begin path:='#?'; exit; end; if path='*' then path:='#?';
end else begin end else begin
{ convert parent directories } { convert parent directories }
tmppos:=pos('../',path); tmppos:=pos('../',path);
@ -533,6 +534,7 @@ begin
{ Changing the directory is a pretty complicated affair } { Changing the directory is a pretty complicated affair }
{ 1) Obtain a lock on the directory } { 1) Obtain a lock on the directory }
{ 2) CurrentDir the lock } { 2) CurrentDir the lock }
writeln('locking: >>',tmpStr,'<<');
tmpLock:=Lock(@tmpStr,SHARED_LOCK); tmpLock:=Lock(@tmpStr,SHARED_LOCK);
if tmpLock=0 then begin if tmpLock=0 then begin
dosError2InOut(IoErr); dosError2InOut(IoErr);
@ -543,7 +545,7 @@ begin
new(FIB); new(FIB);
if (Examine(tmpLock,FIB)=True) and (FIB^.fib_DirEntryType>0) then begin if (Examine(tmpLock,FIB)=True) and (FIB^.fib_DirEntryType>0) then begin
tmpLock := CurrentDir(tmpLock); tmpLock:=CurrentDir(tmpLock);
if MOS_OrigDir=0 then begin if MOS_OrigDir=0 then begin
MOS_OrigDir:=tmpLock; MOS_OrigDir:=tmpLock;
tmpLock:=0; tmpLock:=0;
@ -869,7 +871,10 @@ end.
{ {
$Log$ $Log$
Revision 1.24 2004-12-06 20:09:55 karoly Revision 1.25 2004-12-07 09:55:46 karoly
* previous change broke PathConv, fixed
Revision 1.24 2004/12/06 20:09:55 karoly
* added a public alias to PathConv for use in DOS unit * added a public alias to PathConv for use in DOS unit
Revision 1.23 2004/12/05 14:36:37 hajny Revision 1.23 2004/12/05 14:36:37 hajny