FLTK logo

[master] e6ca751 - Issue #142: fl_filename_absolute correctly handles trailing "..".

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] e6ca751 - Issue #142: fl_filename_absolute correctly handles trailing "..". "Matthias Melcher" Jun 12, 2022  
 
commit e6ca751e92dbd9f42e68dcddee90fc5787f355da
Author:     Matthias Melcher <github@matthiasm.com>
AuthorDate: Sun Jun 12 14:07:01 2022 +0200
Commit:     Matthias Melcher <github@matthiasm.com>
CommitDate: Sun Jun 12 14:07:16 2022 +0200

    Issue #142: fl_filename_absolute correctly handles trailing "..".

 src/filename_absolute.cxx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git src/filename_absolute.cxx src/filename_absolute.cxx
index 4e4e8ff..41f7f64 100644
--- src/filename_absolute.cxx
+++ src/filename_absolute.cxx
@@ -69,19 +69,26 @@ int Fl_System_Driver::filename_absolute(char *to, int tolen, const char *from) {
     return 0;
   }
   a = temp+strlen(temp);
+  /* remove trailing '/' in current working directory */
   if (isdirsep(*(a-1))) a--;
   /* remove intermediate . and .. names: */
   while (*start == '.') {
-    if (start[1]=='.' && isdirsep(start[2])) {
+    if (start[1]=='.' && (isdirsep(start[2]) || start[2]==0) ) {
+      // found "..", remove the last directory segment form cwd
       char *b;
       for (b = a-1; b >= temp && !isdirsep(*b); b--) {/*empty*/}
       if (b < temp) break;
       a = b;
-      start += 3;
+      if (start[2]==0)
+        start += 2; // Skip to end of path
+      else
+        start += 3; // Skip over dir separator
     } else if (isdirsep(start[1])) {
+      // found "./" in path, just skip it
       start += 2;
     } else if (!start[1]) {
-      start ++; // Skip lone "."
+      // found "." at end of path, just skip it
+      start ++;
       break;
     } else
       break;
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.