From 2096b972976b68750dadbed9c159c62fc3ac1678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 6 Mar 2022 21:15:00 +0100
Subject: Cleanup in (hnh util path).

---
 module/hnh/util/path.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'module/hnh/util')

diff --git a/module/hnh/util/path.scm b/module/hnh/util/path.scm
index 7e40259a..28a026bc 100644
--- a/module/hnh/util/path.scm
+++ b/module/hnh/util/path.scm
@@ -2,31 +2,38 @@
   :use-module (srfi srfi-1)
   :use-module (hnh util))
 
+(define // file-name-separator-string)
+(define /? file-name-separator?)
+
 (define-public (path-append . strings)
   (fold (lambda (s done)
-            (string-append
-             done
-             (if (string-null? s)
-                 (string-append s file-name-separator-string)
-                 (if (file-name-separator? (string-last done))
-                     (if (file-name-separator? (string-first s))
-                         (string-drop s 1) s)
-                     (if (file-name-separator? (string-first s))
-                         s (string-append file-name-separator-string s))))))
+          (string-append
+           done
+           (cond ((string-null? s) //)
+                 ((and (/? (string-first s))
+                       (/? (string-last done)))
+                  (string-drop s 1))
+                 ((or (/? (string-first s))
+                      (/? (string-last done)))
+                  s)
+                 (else (string-append // s)))))
         ;; If first component is empty, add a leading slash to make
         ;; the path absolute. This isn't exactly correct if we have
         ;; drive letters, but on those system the user should make
         ;; sure that the first component of the path is non-empty.
         (let ((s (car strings)))
           (if (string-null? s)
-              file-name-separator-string s))
-        (cdr strings)))
+              // s))
+        (cdr strings)
+        ))
 
 (define-public (path-join lst) (apply path-append lst))
 
 ;; @example
 ;; (path-split "usr/lib/test")
 ;; ⇒ ("usr" "lib" "test")
+;; (path-split "usr/lib/test/")
+;; ⇒ ("usr" "lib" "test")
 ;; (path-split "/usr/lib/test")
 ;; ⇒ ("" "usr" "lib" "test")
 ;; (path-split "//usr////lib/test")
@@ -38,7 +45,7 @@
                 (reverse
                  (map reverse-list->string
                       (fold (lambda (c done)
-                              (if (file-name-separator? c)
+                              (if (/? c)
                                   (cons '() done)
                                   (cons (cons c (car done)) (cdr done))))
                             '(())
-- 
cgit v1.2.3