Re: [libvirt] [PATCH v3] storage: Sanitize pool target paths

Spurious / in a pool target path makes life difficult for apps using the GetVolByPath, and doing other path based comparisons with pools. This has caused a few issues for virt-manager users: https://bugzilla.redhat.com/show_bug.cgi?id=494005 https://bugzilla.redhat.com/show_bug.cgi?id=593565 Add a new util API which removes spurious /, virFileSanitizePath. Sanitize target paths when parsing pool XML, and for paths passed to GetVolByPath. v2: Leading // must be preserved, properly sanitize path=/, sanitize away /./ -> / v3: Properly handle starting ./ and ending /. + + /* Need to sanitize: + * // -> // + * /// -> / + * /../foo -> /../foo + * /.//foo -> /foo + * /foo///bar/ -> /foo/bar + * ./foo/./. -> /foo

+ */ + + /* Starting with // is valid posix, but ///foo == /foo */ + if (cur[0] == '/' && cur[1] == '/' && cur[2] != '/') { + idx = 2; + cur += 2; + } + + /* Sanitize path in place */ + while (*cur != '\0') { + int offset = cur - path; + + /* Copy all dirname characters */ + if ((cur[0] != '/' && cur[0] != '.') || + (cur[0] == '.' && cur[1] != '/' && cur[1] != '\0')) { + cleanpath[idx++] = *cur++; + continue; + } + + /* Sanitize away / and single . */ + do { + bool slash_follow = (cur[1] == '/');

+ bool slash_before = (offset != 0 && cur[-1] == '/'); + + /* Skip all extra / */ + if (*cur == '/') { + cur++; + continue; + }