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
This commit is contained in:
Joey Hess 2012-09-25 13:30:32 -04:00
parent 39d60f3570
commit 1233417698
2 changed files with 13 additions and 18 deletions

View file

@ -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