load/@(load): use path_cat.

* eval.c (load): Use path_cat and dir_name instead of ad hoc
path munging.

* match.c (v_load): Likewise.

2 files changed, 2 insertions, 6 deletions

diff --git a/eval.c b/eval.c
index 0915b0b8..f6268344 100644
--- a/eval.c
+++ b/eval.c
@@ -4666,9 +4666,7 @@ val load(val target)
   val parent = or2(load_path, null_string);
   val path = if3(!pure_rel_path_p(target),
                  target,
-                 cat_str(nappend2(sub_list(split_str(parent, lit("/")),
-                                           zero, negone),
-                                  cons(target, nil)), lit("/")));
+                 path_cat(dir_name(parent), target));
   val name = target, stream;
   val txr_lisp_p = t;
   val saved_dyn_env = dyn_env;
diff --git a/match.c b/match.c
index 9d5a0a6b..289214bb 100644
--- a/match.c
+++ b/match.c
@@ -4606,9 +4606,7 @@ static val v_load(match_files_ctx *c)
   {
     val path = if3(!pure_rel_path_p(target),
                    target,
-                   cat_str(nappend2(sub_list(split_str(parent, lit("/")),
-                                         zero, negone),
-                                    cons(target, nil)), lit("/")));
+                   path_cat(dir_name(parent), target));
     val stream, name = target;
     val txr_lisp_p = nil;
     val ret = nil;