فهرست منبع

made sure that drive letters and complex relativ paths work with relative file system

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7486 8c9fc860-2736-0410-a75d-ab315db34111
felixf 7 سال پیش
والد
کامیت
1e273b262b
1فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 4 2
      source/RelativeFileSystem.Mod

+ 4 - 2
source/RelativeFileSystem.Mod

@@ -18,9 +18,10 @@ TYPE PathName=ARRAY 272 OF CHAR;
 			END;
 			IF (ch = "/") & (i>1)  THEN relTo[i-1] := 0X END; (* remove ending "/" *)
 
-			IF ~(Files.NeedsPrefix IN fs.flags) THEN
+			IF fs.prefix # "" THEN
 				RemovePrefix(relTo);
 			END;
+
 			COPY(relTo,SELF.relTo);
 		END InitFileSystem;
 
@@ -62,7 +63,8 @@ TYPE PathName=ARRAY 272 OF CHAR;
 		PROCEDURE Enumerate0 (mask: ARRAY OF CHAR;     flags: SET;     enum: Files.Enumerator);
 		VAR new: PathName;
 		BEGIN
-			MakeRel(mask,new); fs.Enumerate0(new,flags,enum);
+			MakeRel(mask,new); 
+			fs.Enumerate0(new,flags,enum);
 		END Enumerate0;
 
 		PROCEDURE FileKey (name: ARRAY OF CHAR): LONGINT;