James Moger
2012-07-27 5e010729291f732d4f31cbf66649dbac1e795a59
Fixes to relative path determination for symlinks (issue-116)
1 files modified
16 ■■■■■ changed files
src/com/gitblit/utils/FileUtils.java 16 ●●●●● patch | view | raw | blame | history
src/com/gitblit/utils/FileUtils.java
@@ -226,7 +226,21 @@
    public static String getRelativePath(File basePath, File path) {
        File exactBase = getExactFile(basePath);
        File exactPath = getExactFile(path);
        return StringUtils.getRelativePath(exactBase.getPath(), exactPath.getPath());
        if (exactPath.getPath().startsWith(exactBase.getPath())) {
            // canonical base-path match
            return StringUtils.getRelativePath(exactBase.getPath(), exactPath.getPath());
        } else if (exactPath.getPath().startsWith(basePath.getAbsolutePath())) {
            // mixed path match
            return StringUtils.getRelativePath(basePath.getAbsolutePath(), exactPath.getPath());
        } else if (path.getAbsolutePath().startsWith(exactBase.getPath())) {
            // mixed path match
            return StringUtils.getRelativePath(exactBase.getPath(), path.getAbsolutePath());
        } else if (path.getAbsolutePath().startsWith(basePath.getAbsolutePath())) {
            // absolute base-path match
            return StringUtils.getRelativePath(basePath.getAbsolutePath(), path.getAbsolutePath());
        }
        // no relative relationship
        return null;
    }
    
    /**