|
8 | 8 | % * e: expanded path |
9 | 9 |
|
10 | 10 | function e = expanduser(p, use_java) |
11 | | -% arguments |
12 | | -% p (1,1) string |
13 | | -% use_java (1,1) logical = false |
14 | | -% end |
15 | | -if nargin < 2, use_java = false; end |
| 11 | +arguments |
| 12 | + p (1,1) string |
| 13 | + use_java (1,1) logical = false |
| 14 | +end |
16 | 15 |
|
17 | 16 | e = stdlib.drop_slash(p); |
18 | 17 |
|
|
30 | 29 |
|
31 | 30 | home = stdlib.homedir(use_java); |
32 | 31 |
|
33 | | -if ~isempty(home) |
34 | | - d = home; |
35 | | - if L < 2 |
36 | | - e = d; |
37 | | - return |
38 | | - end |
39 | | - |
40 | | - if ischar(e) |
41 | | - e = strcat(d, '/', e(3:end)); |
42 | | - else |
43 | | - e = d + "/" + extractAfter(e, 2); |
44 | | - end |
| 32 | +if stdlib.len(home) == 0 |
| 33 | + return |
| 34 | +end |
| 35 | + |
| 36 | +d = home; |
| 37 | +if L < 2 |
| 38 | + e = d; |
| 39 | + return |
| 40 | +end |
| 41 | + |
| 42 | +if ischar(e) |
| 43 | + e = strcat(d, '/', e(3:end)); |
| 44 | +else |
| 45 | + e = d + "/" + extractAfter(e, 2); |
45 | 46 | end |
46 | 47 |
|
47 | 48 | end |
48 | 49 |
|
49 | 50 |
|
50 | | -%!assert(expanduser(''), '') |
51 | | -%!assert(expanduser("~"), homedir()) |
52 | | -%!assert(expanduser("~/"), homedir()) |
53 | | -%!assert(expanduser("~user"), "~user") |
54 | | -%!assert(expanduser("~user/"), "~user") |
55 | | -%!assert(expanduser("~///c"), strcat(homedir(), "/c")) |
| 51 | +%!assert(expanduser('', 0), '') |
| 52 | +%!assert(expanduser("~", 0), homedir()) |
| 53 | +%!assert(expanduser("~/", 0), homedir()) |
| 54 | +%!assert(expanduser("~user", 0), "~user") |
| 55 | +%!assert(expanduser("~user/", 0), "~user") |
| 56 | +%!assert(expanduser("~///c", 0), strcat(homedir(), "/c")) |
0 commit comments