Changeset 7d77faa in tol

Timestamp:

Jul 2, 2010, 7:54:54 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

cfa4cf7

Parents:

0e7a82f

Message:

GetStandardAbsolutePath and GetAbsolutePath must ensure to return the last slash only if original path had it

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2359 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/dir.cpp (modified) (3 diffs)

tol/bbasic/dir.cpp

@@ -430 +430 @@
     p = fp+GetFileName(p);
   }
-  if(endSlash)
+  if(endSlash  && !IsSlash(p.Last()))
   {
     p += "/";
@@ -451 +451 @@
 //--------------------------------------------------------------------
 {
-//if(!path_.HasName()) { return(path_); }
-  /*
-#if defined(UNIX)
-  char* ret_path = new char[PATH_MAX];
-  if(realpath(path_.String(), ret_path)==NULL) {
-    Error(path_+":"+strerror(errno));
-  }
-  return BText(ret_path);
-#else
-  */
+  bool endSlash = IsSlash(path_.Last());
   BText path = GetAbsolutePath(path_);
 #ifdef WIN32
@@ -469 +460 @@
   path.Copy(fName,len);
   path.Replace("\\","/");
+#else
+  //VBR: hay que buscar alguna forma de estandarizar el path en linux
+  //eliminando cosas inútiles como /./
+#endif
+  if(endSlash && !IsSlash(path.Last()))
+  {
+    path += "/";
+  }
   return(path);
-#else
-  return path;
-#endif
-  /*
-#endif
-  */
 }