diff options
| author | makefu <github@syntax-fehler.de> | 2017-03-31 18:27:25 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-03-31 18:27:25 +0200 |
| commit | a4b524e902c9408b59ab678820121d3cfafd2aad (patch) | |
| tree | 9b0e33e1bdec3cbabcb0d82de269285bb0085b29 | |
| parent | c9efa8b3f4934f165795f07b7e75a7f5fca3b7d8 (diff) | |
| parent | fb17ddd613585d0eea3461d0b3d0d2abf9ff24b1 (diff) | |
Merge remote-tracking branch 'tv/master'
| -rw-r--r-- | lib/types.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/types.nix b/lib/types.nix index edd48c3..8a3c764 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -5,7 +5,7 @@ let all any concatMapStringsSep concatStringsSep const filter flip genid hasSuffix head isInt isString length match mergeOneOption mkOption mkOptionType optional optionalAttrs optionals range splitString - stringLength tail typeOf; + stringLength substring typeOf; inherit (lib.types) attrsOf bool either enum int listOf nullOr path str string submodule; in @@ -430,23 +430,23 @@ rec { }; # POSIX.1‐2013, 3.2 Absolute Pathname - # TODO normalize slashes - # TODO two slashes absolute-pathname = mkOptionType { name = "POSIX absolute pathname"; - check = x: let xs = splitString "/" x; xa = head xs; in - isString x - && stringLength x > 0 - && (xa == "/" || (xa == "" && all filename.check (tail xs))); + check = x: isString x && substring 0 1 x == "/" && pathname.check x; merge = mergeOneOption; }; # POSIX.1‐2013, 3.267 Pathname - # TODO normalize slashes pathname = mkOptionType { name = "POSIX pathname"; - check = x: let xs = splitString "/" x; in - isString x && all filename.check (if head xs == "" then tail xs else xs); + check = x: + let + # The filter is used to normalize paths, i.e. to remove duplicated and + # trailing slashes. It also removes leading slashes, thus we have to + # check for "/" explicitly below. + xs = filter (s: stringLength s > 0) (splitString "/" x); + in + isString x && (x == "/" || (length xs > 0 && all filename.check xs)); merge = mergeOneOption; }; |