File tree Expand file tree Collapse file tree 1 file changed +14
-23
lines changed Expand file tree Collapse file tree 1 file changed +14
-23
lines changed Original file line number Diff line number Diff line change 1111b = stdlib .drop_slash(base );
1212o = stdlib .drop_slash(other );
1313
14- Lb = stdlib .len(b );
15- Lo = stdlib .len(o );
16-
17- if ~Lb && ~Lo
18- p = " " ;
19- return
20- end
21-
22- if ~Lb
23- p = o ;
24- return
25- end
26-
27- if ~stdlib .len(o )
28- p = b ;
29- return
30- end
31-
3214if stdlib .isoctave()
33- p = javaObject(" java.io.File" , b ).toPath().resolve(o ).toString();
15+ o = javaObject(" java.io.File" , b ).toPath().resolve(o );
16+ p = jPosix(o );
3417elseif use_java
35- p = string(java .io .File(b ).toPath().resolve(o ));
18+ o = java .io .File(b ).toPath().resolve(o );
19+ p = jPosix(o );
3620else
3721
3822if startsWith(o , " /" ) || (ispc && stdlib .is_absolute(o ))
3923 p = o ;
4024 return
4125end
4226
43- p = b + " /" + o ;
44-
27+ p = b ;
28+ if strlength(o )
29+ if endsWith(p , " /" )
30+ p = p + o ;
31+ elseif strlength(p )
32+ p = p + " /" + o ;
33+ else
34+ p = o ;
35+ end
4536end
4637
47- p = stdlib .posix( p );
38+ end
4839
4940end
5041
You can’t perform that action at this time.
0 commit comments