hasufell/hpath
1
1
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Fix bug in createDirRecursive with trailing path separators

Browse Source
This commit is contained in:
Julian Ospald 2020-02-17 18:50:08 +01:00
parent 23f4221fe1
commit ec9884276c
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hpath-directory/CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Revision history for hpath-directory # Revision history for hpath-directory
## 0.13.2 -- 2020-02-17
* Fix bug in `createDirRecursive` with trailing path separators
## 0.13.1 -- 2020-01-29 ## 0.13.1 -- 2020-01-29
* Split some functionality out into 'hpath-posix' * Split some functionality out into 'hpath-posix'

2
hpath-directory/hpath-directory.cabal
View File

@ -1,7 +1,7 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: hpath-directory name: hpath-directory
version: 0.13.1 version: 0.13.2
synopsis: Alternative to 'directory' package with ByteString based filepaths synopsis: Alternative to 'directory' package with ByteString based filepaths
description: This provides a safer alternative to the 'directory' description: This provides a safer alternative to the 'directory'
package. FilePaths are ByteString based, so this package. FilePaths are ByteString based, so this

4
hpath-directory/src/System/Posix/RawFilePath/Directory.hs
View File

@ -742,8 +742,8 @@ createDirRecursive fm p = go p
| en == eEXIST | en == eEXIST
-> unlessM (doesDirectoryExist dest) (ioError e) -> unlessM (doesDirectoryExist dest) (ioError e)
| en == eNOENT | en == eNOENT
-> createDirRecursive fm (takeDirectory dest) -> go (takeDirectory $ dropTrailingPathSeparator dest)
>> createDirectory dest fm >> createDir fm dest
| otherwise | otherwise
-> ioError e -> ioError e

5
hpath-directory/test/System/Posix/RawFilePath/Directory/CreateDirRecursiveSpec.hs
View File

@ -49,6 +49,11 @@ spec = beforeAll_ (upTmpDir >> setupFiles) $ afterAll_ cleanupFiles $
createDirRecursive' "newDir" createDirRecursive' "newDir"
deleteDir' "newDir" deleteDir' "newDir"
it "createDirRecursive with trailing path separator, all fine" $ do
createDirRecursive' "newDir/foo/"
deleteDir' "newDir/foo"
deleteDir' "newDir"
it "createDirRecursive, parent directories do not exist" $ do it "createDirRecursive, parent directories do not exist" $ do
createDirRecursive' "some/thing/dada" createDirRecursive' "some/thing/dada"
deleteDir' "some/thing/dada" deleteDir' "some/thing/dada"