move sticky bit code into Utility.FileMode

Simplified it using existing functions.

I doubt setSticky needs to return the FileMode; if it does for some
reason, it can be changed to use modifyFileMode'

Converted isSticky to a pure function for consistency with isSymlink.
Note that the sticky bit of a file can be tested thus:
  isSticky . fileMode <$> getFileStatus file

2 files changed, 13 insertions, 18 deletions

diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 6f45cfabc..834ca8af6 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -27,9 +27,6 @@ import Utility.FileMode
 import Config
 import qualified Option
 import Types.Key
-import System.Posix.Types
-import System.Posix.Files
-import Data.Bits
 
 def :: [Command]
 def = [withOptions options $ command "fsck" paramPaths seek
@@ -322,20 +319,6 @@ badContentRemote remote key = do
 	return $ (if ok then "dropped from " else "failed to drop from ")
 		++ Remote.name remote
 
-isSticky :: String -> IO Bool
-isSticky f = do
-	fs <- getFileStatus f
-	let mode = fileMode fs
-	return $ 0/= mode .&. 512
-
-setSticky :: String -> IO FileMode
-setSticky f = do
-	fs <- getFileStatus f
-	let mode = fileMode fs
-	let newmode = mode .|. 512
-	setFileMode f newmode
-	return newmode
-
 updateMetadata :: Key -> Annex Bool
 updateMetadata key = do
 	file <- inRepo $ gitAnnexLocation key
diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs
index 353de7b92..c742c690b 100644
--- a/Utility/FileMode.hs
+++ b/Utility/FileMode.hs
@@ -63,9 +63,12 @@ groupWriteRead f = modifyFileMode f $ addModes
 	, ownerReadMode, groupReadMode
 	]
 
+checkMode :: FileMode -> FileMode -> Bool
+checkMode checkfor mode = checkfor `intersectFileModes` mode == checkfor
+
 {- Checks if a file mode indicates it's a symlink. -}
 isSymLink :: FileMode -> Bool
-isSymLink mode = symbolicLinkMode `intersectFileModes` mode == symbolicLinkMode
+isSymLink = checkMode symbolicLinkMode
 
 {- Checks if a file has any executable bits set. -}
 isExecutable :: FileMode -> Bool
@@ -88,3 +91,12 @@ combineModes :: [FileMode] -> FileMode
 combineModes [] = undefined
 combineModes [m] = m
 combineModes (m:ms) = foldl unionFileModes m ms
+
+stickyMode :: FileMode
+stickyMode = 512
+
+isSticky :: FileMode -> Bool
+isSticky = checkMode stickyMode
+
+setSticky :: FilePath -> IO ()
+setSticky f = modifyFileMode f $ addModes [stickyMode]