Supports indirect mode on encfs in paranoia mode, and other filesystems that do not support hard links, but do support symlinks and other POSIX filesystem features.
This commit is contained in:
parent
9cf6d8130c
commit
a64106dcef
6 changed files with 65 additions and 45 deletions
|
@ -80,20 +80,21 @@ start file = ifAnnexed file addpresent add
|
|||
|
||||
{- The file that's being added is locked down before a key is generated,
|
||||
- to prevent it from being modified in between. It's hard linked into a
|
||||
- temporary location, and its writable bits are removed. It could still be
|
||||
- written to by a process that already has it open for writing.
|
||||
- temporary location (to prevent it being replaced with another file),
|
||||
- and its writable bits are removed. It could still be written to by a
|
||||
- process that already has it open for writing.
|
||||
-
|
||||
- On a crippled filesystem, no lock down is done; the file can be modified
|
||||
- at any time, and the no hard link is made.
|
||||
-
|
||||
- On a filesystem without hard links, but not otherwise crippled,
|
||||
- no hard link is made, but the write bit is still removed.
|
||||
-
|
||||
- Lockdown can fail if a file gets deleted, and Nothing will be returned.
|
||||
-}
|
||||
lockDown :: FilePath -> Annex (Maybe KeySource)
|
||||
lockDown file = ifM (crippledFileSystem)
|
||||
( liftIO $ catchMaybeIO $ do
|
||||
cache <- genInodeCache file
|
||||
return $ KeySource
|
||||
{ keyFilename = file
|
||||
, contentLocation = file
|
||||
, inodeCache = cache
|
||||
}
|
||||
( liftIO $ catchMaybeIO nohardlink
|
||||
, do
|
||||
tmp <- fromRepo gitAnnexTmpDir
|
||||
createAnnexDirectory tmp
|
||||
|
@ -102,14 +103,24 @@ lockDown file = ifM (crippledFileSystem)
|
|||
(tmpfile, h) <- openTempFile tmp (takeFileName file)
|
||||
hClose h
|
||||
nukeFile tmpfile
|
||||
createLink file tmpfile
|
||||
cache <- genInodeCache tmpfile
|
||||
return $ KeySource
|
||||
{ keyFilename = file
|
||||
, contentLocation = tmpfile
|
||||
, inodeCache = cache
|
||||
}
|
||||
withhardlink tmpfile `catchIO` const nohardlink
|
||||
)
|
||||
where
|
||||
nohardlink = do
|
||||
cache <- genInodeCache file
|
||||
return $ KeySource
|
||||
{ keyFilename = file
|
||||
, contentLocation = file
|
||||
, inodeCache = cache
|
||||
}
|
||||
withhardlink tmpfile = do
|
||||
createLink file tmpfile
|
||||
cache <- genInodeCache tmpfile
|
||||
return $ KeySource
|
||||
{ keyFilename = file
|
||||
, contentLocation = tmpfile
|
||||
, inodeCache = cache
|
||||
}
|
||||
|
||||
{- Ingests a locked down file into the annex.
|
||||
-
|
||||
|
|
|
@ -7,8 +7,6 @@
|
|||
|
||||
module Command.ReKey where
|
||||
|
||||
import System.PosixCompat.Files
|
||||
|
||||
import Common.Annex
|
||||
import Command
|
||||
import qualified Annex
|
||||
|
@ -17,7 +15,6 @@ import Annex.Content
|
|||
import qualified Command.Add
|
||||
import Logs.Web
|
||||
import Logs.Location
|
||||
import Config
|
||||
import Utility.CopyFile
|
||||
|
||||
def :: [Command]
|
||||
|
@ -49,18 +46,14 @@ perform file oldkey newkey = do
|
|||
return True
|
||||
next $ cleanup file oldkey newkey
|
||||
|
||||
{- Make a hard link to the old key content, to avoid wasting disk space. -}
|
||||
{- Make a hard link to the old key content (when supported),
|
||||
- to avoid wasting disk space. -}
|
||||
linkKey :: Key -> Key -> Annex Bool
|
||||
linkKey oldkey newkey = getViaTmpUnchecked newkey $ \tmp -> do
|
||||
src <- calcRepo $ gitAnnexLocation oldkey
|
||||
ifM (liftIO $ doesFileExist tmp)
|
||||
liftIO $ ifM (doesFileExist tmp)
|
||||
( return True
|
||||
, ifM crippledFileSystem
|
||||
( liftIO $ copyFileExternal src tmp
|
||||
, do
|
||||
liftIO $ createLink src tmp
|
||||
return True
|
||||
)
|
||||
, createLinkOrCopy src tmp
|
||||
)
|
||||
|
||||
cleanup :: FilePath -> Key -> Key -> CommandCleanup
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue