From 8a7e0d5a18b4f38ed350d248b1ecdc37a0f042a3 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 5 May 2022 09:34:09 -0700
Subject: import PARSE-UNIX-NAMESTRING and DIRECTORY-PATHNAME-P

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---
 src/data/util.lisp | 6 +++---
 src/package.lisp   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/data/util.lisp b/src/data/util.lisp
index 871eb9a..aa0451f 100644
--- a/src/data/util.lisp
+++ b/src/data/util.lisp
@@ -29,12 +29,12 @@ pathname components are removed.
 The intended use case is to map IDEN1 and IDEN2 to files in a user-maintained
 hierarchy under BASE-PATH.  In particular IDEN2 and (if prefixed by '_') IDEN1
 may contain '/' characters to map into multiple levels of directory."
-  (let ((base-dir (uiop:parse-unix-namestring base-path :ensure-directory t)))
-    (unless (uiop:directory-pathname-p base-dir)
+  (let ((base-dir (parse-unix-namestring base-path :ensure-directory t)))
+    (unless (directory-pathname-p base-dir)
       (simple-program-error "~A does not specify a directory" base-dir))
     (merge-pathnames
      (uiop:relativize-pathname-directory
-      (uiop:parse-unix-namestring iden2 :type type))
+      (parse-unix-namestring iden2 :type type))
      (merge-pathnames
       (uiop:relativize-pathname-directory
        (ensure-directory-pathname iden1))
diff --git a/src/package.lisp b/src/package.lisp
index 51c634c..097af65 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -17,6 +17,7 @@
                           #:subprocess-error
                           #:stripln
                           #:unix-namestring
+                          #:parse-unix-namestring
                           #:pathname-directory-pathname
                           #:pathname-parent-directory-pathname
                           #:resolve-symlinks
@@ -28,6 +29,7 @@
                           #:subpathp
                           #:relative-pathname-p
                           #:absolute-pathname-p
+                          #:directory-pathname-p
                           #:getenv
                           #:subdirectories
                           #:directory-files
@@ -57,6 +59,7 @@
            #:subprocess-error
            #:stripln
            #:unix-namestring
+           #:parse-unix-namestring
            #:pathname-directory-pathname
            #:pathname-parent-directory-pathname
            #:resolve-symlinks
@@ -68,6 +71,7 @@
            #:subpathp
            #:relative-pathname-p
            #:absolute-pathname-p
+           #:directory-pathname-p
            #:getenv
            #:subdirectories
            #:directory-files
-- 
cgit v1.2.3