mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-03-09 14:40:37 -07:00
Code Issues Projects Releases Packages Wiki Activity

logical pathnames: fix logical pathname translation for multiple *

Browse source 
After this commit

    (setf (logical-pathname-translations "x")
          (list ("X:a;*;b;*;*.*" "/hello/*/hi/*/what/*.*")))
    (translate-logical-pathname #p"x:a;bonjour;b;barev;greetings.me")

will return a correct result

    #P"/hello/bonjour/hi/barev/what/greetings.me"

Related to #784.
This commit is contained in:
Daniel Kochmański 2025-06-26 14:06:17 +02:00
parent 03e61206ba
commit 5818808f7c
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/c/pathname.d
View file

@ -1662,9 +1662,16 @@ copy_wildcards(cl_object *wilds_list, cl_object pattern)
if (ecl_endp(wilds))
return @':error';
pattern = CAR(wilds);
if(CONSP(pattern)) {
/* find_wilds constructs a list with one element */
if(!Null(CDR(pattern)))
return @':error';
pattern = CAR(pattern);
}
*wilds_list = CDR(wilds);
return pattern;
}
if (pattern == @':wild-inferiors')
return @':error';
if (!ecl_stringp(pattern))
@ -1702,8 +1709,7 @@ copy_wildcards(cl_object *wilds_list, cl_object pattern)
static cl_object
copy_list_wildcards(cl_object *wilds, cl_object to)
{
cl_object l = ECL_NIL;
cl_object result = ECL_NIL;
while (!ecl_endp(to)) {
cl_object d, mask = CAR(to);
if (mask == @':wild-inferiors') {
@ -1713,22 +1719,22 @@ copy_list_wildcards(cl_object *wilds, cl_object to)
else {
cl_object dirlist = CAR(list);
if (CONSP(dirlist))
l = ecl_append(CAR(list), l);
else if (!Null(CAR(list)))
result = ecl_append(dirlist, result);
else if (!Null(dirlist))
return @':error';
}
*wilds = CDR(list);
} else {
d = copy_wildcards(wilds, CAR(to));
d = copy_wildcards(wilds, mask);
if (d == @':error')
return d;
l = CONS(d, l);
result = CONS(d, result);
}
to = CDR(to);
}
if (CONSP(l))
l = @nreverse(l);
return l;
if (CONSP(result))
result = @nreverse(result);
return result;
}
@(defun translate-pathname (source from to &key)