[cvs-nhc98] patch applied (yhc): Use default FilePath version, getDirectory -> takeDirectory