diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-27 17:52:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-27 17:52:20 -0400 |
| commit | 9e53aca36b2b709034dc3ff57827a964e4a8a3d8 (patch) | |
| tree | 7d72f4ffb9ea420be76e1ea8d8a9a451672ea32f | |
| parent | 9dc4ae46a6aac0d107c30b98bf137bc0dd5a4963 (diff) | |
addurl, importfeed: Sanitize | and some other symbols and special characters.
| -rw-r--r-- | Utility/Path.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/git_annex_addurl___40__+quvi__41___should_filter_out_the___124_____40__pipe__41___character.mdwn | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Utility/Path.hs b/Utility/Path.hs index b6214b247..44ac72f06 100644 --- a/Utility/Path.hs +++ b/Utility/Path.hs @@ -242,13 +242,13 @@ fileNameLengthLimit dir = do - was provided by a third party and is not to be trusted, returns the closest - sane FilePath. - - - All spaces and punctuation are replaced with '_', except for '.' - - "../" will thus turn into ".._", which is safe. + - All spaces and punctuation and other wacky stuff are replaced + - with '_', except for '.' "../" will thus turn into ".._", which is safe. -} sanitizeFilePath :: String -> FilePath sanitizeFilePath = map sanitize where sanitize c | c == '.' = c - | isSpace c || isPunctuation c || c == '/' = '_' + | isSpace c || isPunctuation c || isSymbol c || isControl c || c == '/' = '_' | otherwise = c diff --git a/debian/changelog b/debian/changelog index 11e1d21ee..9692cc56c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (5.20131222) UNRELEASED; urgency=medium in the Linux standalone build, and OSX app, so they will be available when it's added to PATH. * Added new external special remote interface. + * addurl, importfeed: Sanitize | and some other symbols and special + characters. -- Joey Hess <joeyh@debian.org> Tue, 24 Dec 2013 13:54:32 -0400 diff --git a/doc/bugs/git_annex_addurl___40__+quvi__41___should_filter_out_the___124_____40__pipe__41___character.mdwn b/doc/bugs/git_annex_addurl___40__+quvi__41___should_filter_out_the___124_____40__pipe__41___character.mdwn index 56bc7c475..89f101498 100644 --- a/doc/bugs/git_annex_addurl___40__+quvi__41___should_filter_out_the___124_____40__pipe__41___character.mdwn +++ b/doc/bugs/git_annex_addurl___40__+quvi__41___should_filter_out_the___124_____40__pipe__41___character.mdwn @@ -22,3 +22,6 @@ git annex addurl will keep the »|« symbol in the filename generated from the v Ubuntu 13.10 ### Please provide any additional information below. + +> Ah, I see, pipe is not considered to be punctuation, but a math symbol. +> [[fixed|done]] --[[Joey]] |