浏览代码

+ fixpath() has an extra option to allow a ./ as path

peter 27 年之前
父节点
当前提交
aea3c488fb
共有 3 个文件被更改,包括 16 次插入7 次删除
  1. 5 2
      compiler/assemble.pas
  2. 6 3
      compiler/files.pas
  3. 5 2
      compiler/link.pas

+ 5 - 2
compiler/assemble.pas

@@ -445,7 +445,7 @@ begin
       mkdir(path);
       mkdir(path);
      {$I+}
      {$I+}
      i:=ioresult;
      i:=ioresult;
-     path:=FixPath(path);
+     path:=FixPath(path,false);
    end
    end
   else
   else
    path:=current_module^.path^;
    path:=current_module^.path^;
@@ -528,7 +528,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.30  1998-10-16 13:37:14  florian
+  Revision 1.31  1998-10-26 22:23:28  peter
+    + fixpath() has an extra option to allow a ./ as path
+
+  Revision 1.30  1998/10/16 13:37:14  florian
     + switch -FD added to specify the path for utilities
     + switch -FD added to specify the path for utilities
 
 
   Revision 1.29  1998/10/15 16:19:42  peter
   Revision 1.29  1998/10/15 16:19:42  peter

+ 6 - 3
compiler/files.pas

@@ -595,7 +595,7 @@ unit files;
          fsplit(fn,p,n,e);
          fsplit(fn,p,n,e);
          n:=FixFileName(n);
          n:=FixFileName(n);
          { set path }
          { set path }
-         path:=stringdup(FixPath(p));
+         path:=stringdup(FixPath(p,false));
          { obj,asm,ppu names }
          { obj,asm,ppu names }
          p:=path^;
          p:=path^;
          if AllowOutput then
          if AllowOutput then
@@ -766,7 +766,7 @@ unit files;
            i:=pos(';',unitpath);
            i:=pos(';',unitpath);
            if i=0 then
            if i=0 then
             i:=length(unitpath)+1;
             i:=length(unitpath)+1;
-           singlepathstring:=FixPath(copy(unitpath,start,i-start));
+           singlepathstring:=FixPath(copy(unitpath,start,i-start),false);
            delete(unitpath,start,i-start+1);
            delete(unitpath,start,i-start+1);
          { Check for PPL file }
          { Check for PPL file }
            if not Found then
            if not Found then
@@ -1022,7 +1022,10 @@ unit files;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.66  1998-10-19 18:07:11  peter
+  Revision 1.67  1998-10-26 22:23:29  peter
+    + fixpath() has an extra option to allow a ./ as path
+
+  Revision 1.66  1998/10/19 18:07:11  peter
     + external dll_name name func support for linux
     + external dll_name name func support for linux
 
 
   Revision 1.65  1998/10/15 12:22:25  pierre
   Revision 1.65  1998/10/15 12:22:25  pierre

+ 5 - 2
compiler/link.pas

@@ -462,7 +462,7 @@ var
   arfound : boolean;
   arfound : boolean;
   cnt     : longint;
   cnt     : longint;
 begin
 begin
-  smartpath:=current_module^.path^+FixPath(FixFileName(current_module^.modulename^)+target_info.smartext);
+  smartpath:=current_module^.path^+FixPath(FixFileName(current_module^.modulename^)+target_info.smartext,false);
 { find ar binary }
 { find ar binary }
   if utilsdirectory<>'' then
   if utilsdirectory<>'' then
     begin
     begin
@@ -514,7 +514,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.36  1998-10-22 15:18:44  florian
+  Revision 1.37  1998-10-26 22:23:31  peter
+    + fixpath() has an extra option to allow a ./ as path
+
+  Revision 1.36  1998/10/22 15:18:44  florian
     + switch -vx for win32 added
     + switch -vx for win32 added
 
 
   Revision 1.35  1998/10/19 18:06:23  peter
   Revision 1.35  1998/10/19 18:06:23  peter