Преглед на файлове

* made MorphOS build to cycle again: fixed path_absolute() for Amiga and MorphOS, and fixed AllFilesMask for MorphOS

git-svn-id: trunk@13474 -
Károly Balogh преди 16 години
родител
ревизия
c11243c83d
променени са 2 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 4 1
      compiler/cfileutl.pas
  2. 1 1
      rtl/morphos/system.pp

+ 4 - 1
compiler/cfileutl.pas

@@ -523,7 +523,10 @@ end;
         if (length(s)>0) and (s[1] in AllowDirectorySeparators) then
         if (length(s)>0) and (s[1] in AllowDirectorySeparators) then
           result:=true;
           result:=true;
 {$elseif defined(amiga) or defined(morphos)}
 {$elseif defined(amiga) or defined(morphos)}
-        if ((length(s)>0) and (s[1] in AllowDirectorySeparators)) or (Pos(':',s) = length(s)) then
+        (* An Amiga path is absolute, if it has a volume/device name in it (contains ":"), 
+           otherwise it's always a relative path, no matter if it starts with a directory 
+           separator or not. (KB) *)
+        if (length(s)>0) and (Pos(':',s) <> 0) then
           result:=true;
           result:=true;
 {$elseif defined(macos)}
 {$elseif defined(macos)}
         if IsMacFullPath(s) then
         if IsMacFullPath(s) then

+ 1 - 1
rtl/morphos/system.pp

@@ -38,7 +38,7 @@ const
   AllowDriveSeparators : set of char = [':'];
   AllowDriveSeparators : set of char = [':'];
   maxExitCode = 255;
   maxExitCode = 255;
   MaxPathLen = 256;
   MaxPathLen = 256;
-  AllFilesMask = '*';
+  AllFilesMask = '#?';
 
 
 const
 const
   UnusedHandle    : LongInt = -1;
   UnusedHandle    : LongInt = -1;