Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

krebs {absolute,}-pathname: admit harder

Browse Source
This commit is contained in:
tv 2016-06-12 18:13:05 +02:00
parent 66bcbc56ea
commit 29442eda7c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
krebs/4lib/types.nix
View File

@ -334,7 +334,8 @@ types // rec {
# TODO two slashes # TODO two slashes
absolute-pathname = mkOptionType { absolute-pathname = mkOptionType {
name = "POSIX absolute pathname"; name = "POSIX absolute pathname";
check = s: s == "/" || (pathname.check s && substring 0 1 s == "/"); check = x: let xs = splitString "/" x; xa = head xs; in
xa == "/" || (xa == "" && all filename.check (tail xs));
merge = mergeOneOption; merge = mergeOneOption;
}; };
@ -342,7 +343,8 @@ types // rec {
# TODO normalize slashes # TODO normalize slashes
pathname = mkOptionType { pathname = mkOptionType {
name = "POSIX pathname"; name = "POSIX pathname";
check = s: isString s && all filename.check (splitString "/" s); check = x: let xs = splitString "/" x; in
all filename.check (if head xs == "" then tail xs else xs);
merge = mergeOneOption; merge = mergeOneOption;
}; };