encfs-trueondemand/true_ondemand.patch

   1 --- encfs-orig/encfs/main.cpp   2009-11-29 23:04:12.000000000 +0100
   2 +++ src/encfs-1.7.4/encfs/main.cpp      2011-09-19 11:38:35.000000000 +0200
   3 @@ -50,6 +50,7 @@
   4  #include "Context.h"
   5
   6  #include "openssl.h"
   7 +#include "signal.h"
   8
   9  // Fuse version >= 26 requires another argument to fuse_unmount, which we
  10  // don't have.  So use the backward compatible call instead..
  11 @@ -482,6 +483,14 @@
  12      }
  13  }
  14
  15 +EncFS_Context *ctx;
  16 +
  17 +void handle_sigusr1(int signo)
  18 +{
  19 + ctx->setRoot( shared_ptr<DirNode>() );
  20 +}
  21 +
  22 +
  23  int main(int argc, char *argv[])
  24  {
  25      // initialize the logging library
  26 @@ -586,16 +595,24 @@
  27
  28      // context is not a smart pointer because it will live for the life of
  29      // the filesystem.
  30 -    EncFS_Context *ctx = new EncFS_Context;
  31 +    ctx = new EncFS_Context;
  32 +    signal(SIGUSR1,handle_sigusr1);
  33      ctx->publicFilesystem = encfsArgs->opts->ownerCreate;
  34 -    RootPtr rootInfo = initFS( ctx, encfsArgs->opts );
  35 +    RootPtr rootInfo;
  36
  37      int returnCode = EXIT_FAILURE;
  38
  39 -    if( rootInfo )
  40 +    if (!encfsArgs->opts->mountOnDemand)
  41 +      rootInfo = initFS( ctx, encfsArgs->opts );
  42 +
  43 +
  44 +    if( rootInfo || encfsArgs->opts->mountOnDemand )
  45      {
  46         // set the globally visible root directory node
  47 -       ctx->setRoot( rootInfo->root );
  48 +        if ( encfsArgs->opts->mountOnDemand )
  49 +          ctx->setRoot( shared_ptr<DirNode>() );
  50 +        else
  51 +         ctx->setRoot( rootInfo->root );
  52         ctx->args = encfsArgs;
  53         ctx->opts = encfsArgs->opts;
  54
  55 @@ -691,11 +708,14 @@
  56  static
  57  void * idleMonitor(void *_arg)
  58  {
  59 -    EncFS_Context *ctx = (EncFS_Context*)_arg;
  60 +    ctx = (EncFS_Context*)_arg;
  61      shared_ptr<EncFS_Args> arg = ctx->args;
  62
  63      const int timeoutCycles = 60 * arg->idleTimeout / ActivityCheckInterval;
  64      int idleCycles = 0;
  65 +
  66 +    if (arg->opts->mountOnDemand)
  67 +       idleCycles = timeoutCycles +1;
  68
  69      pthread_mutex_lock( &ctx->wakeupMutex );
  70