|
@@ -281,6 +281,7 @@ begin
|
|
|
{$ENDIF DIRECT}
|
|
|
{$I+}
|
|
|
GetDir (0, CurDir);
|
|
|
+ Writeln('CurDir is "',CurDir,'"');
|
|
|
{$IFDEF DIRECT}
|
|
|
{$IFNDEF FPC_FEXPAND_DRIVES}
|
|
|
I := Pos (System.DriveSeparator, CurDir);
|
|
@@ -290,6 +291,7 @@ begin
|
|
|
{$ENDIF DIRECT}
|
|
|
{$IFNDEF NODRIVEC}
|
|
|
GetDir (3, CDir);
|
|
|
+ Writeln('GetDir(3,X) gives X="',CurDir,'"');
|
|
|
{$ENDIF NODRIVEC}
|
|
|
Check (' ', CurDir + DirSep + ' ');
|
|
|
{$IFDEF HASAMIGA}
|
|
@@ -470,22 +472,31 @@ if CDir [Length (CDir)] = DirSep then Check ('c:anything', CDir + 'anything')
|
|
|
{$I+}
|
|
|
{$IFDEF FPC}
|
|
|
Check ('d\d/d', CurDir + DirSep + 'd' + DirSep + 'd' + DirSep + 'd');
|
|
|
- Check ('\\server\share\directory', '\\server\share\directory');
|
|
|
- Check ('\\server\share\directory1\directory2\..',
|
|
|
- '\\server\share\directory1');
|
|
|
- Check ('\\', '\\');
|
|
|
- Check ('\\.', '\\.\');
|
|
|
- Check ('\\.\', '\\.\');
|
|
|
- Check ('\\.\.', '\\.\.');
|
|
|
- Check ('\\.\..', '\\.\..');
|
|
|
- Check ('\\.\...', '\\.\...');
|
|
|
- Check ('\\.\TEST', '\\.\TEST');
|
|
|
- Check ('\\..\', '\\..\');
|
|
|
- Check ('\\..\TEST', '\\..\TEST');
|
|
|
- Check ('\\..\TEST\.', '\\..\TEST');
|
|
|
- Check ('\\..\TEST1\TEST2\..', '\\..\TEST1');
|
|
|
- Check ('\\..\TEST\..', '\\..\TEST');
|
|
|
- Check ('\\..\TEST\..\..', '\\..\TEST');
|
|
|
+{$ifdef go32v2}
|
|
|
+ { for go32v2 target UNC paths are only handled if LFNSupport is true }
|
|
|
+ if not LFNSupport then
|
|
|
+ writeln('Go32v2 without LFN, no UNC support')
|
|
|
+ else
|
|
|
+{$endif}
|
|
|
+ begin
|
|
|
+ { Check UNC style paths }
|
|
|
+ Check ('\\server\share\directory', '\\server\share\directory');
|
|
|
+ Check ('\\server\share\directory1\directory2\..',
|
|
|
+ '\\server\share\directory1');
|
|
|
+ Check ('\\', '\\');
|
|
|
+ Check ('\\.', '\\.\');
|
|
|
+ Check ('\\.\', '\\.\');
|
|
|
+ Check ('\\.\.', '\\.\.');
|
|
|
+ Check ('\\.\..', '\\.\..');
|
|
|
+ Check ('\\.\...', '\\.\...');
|
|
|
+ Check ('\\.\TEST', '\\.\TEST');
|
|
|
+ Check ('\\..\', '\\..\');
|
|
|
+ Check ('\\..\TEST', '\\..\TEST');
|
|
|
+ Check ('\\..\TEST\.', '\\..\TEST');
|
|
|
+ Check ('\\..\TEST1\TEST2\..', '\\..\TEST1');
|
|
|
+ Check ('\\..\TEST\..', '\\..\TEST');
|
|
|
+ Check ('\\..\TEST\..\..', '\\..\TEST');
|
|
|
+ end;
|
|
|
{$ENDIF FPC}
|
|
|
{$ENDIF NODRIVEC}
|
|
|
{$ENDIF UNIX}
|