Cygwin, better handle read-only FS

vgough · Apr 6, 2018 · dbfff03 · dbfff03
1 parent 980648c
commit dbfff03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/encfs/main.cpp b/encfs/main.cpp
@@ -605,6 +605,14 @@ void *encfs_init(fuse_conn_info *conn) {
   // set fuse connection options
   conn->async_read = 1u;
 
+#ifdef __CYGWIN__
+  // WinFsp needs this to partially handle read-only FS
+  // See https://github.com/billziss-gh/winfsp/issues/157 for details
+  if (ctx->opts->readOnly) {
+    conn->want |= (conn->capable & FSP_FUSE_CAP_READ_ONLY);
+  }
+#endif
+
   // if an idle timeout is specified, then setup a thread to monitor the
   // filesystem.
   if (ctx->args->idleTimeout > 0) {

diff --git a/integration/normal.t.pl b/integration/normal.t.pl
@@ -329,7 +329,7 @@ sub links
 {
     my $hardlinkTests = shift;
 
-    my $contents = "hello world\n";
+    my $contents = "hello world";
     ok( open(OUT, "> $crypt/data"), "create file for link test" );
     print OUT $contents;
     close OUT;

diff --git a/integration/reverse.t.pl b/integration/reverse.t.pl
@@ -141,7 +141,7 @@ sub symlink_test
 {
     my $target = shift;
     ok(symlink($target, "$plain/symlink"), "Symlink create, $plain/symlink -> $target");
-    ok(my $dec = readlink("$decrypted/symlink"), "Symlink read, $decrypted/symlink");
+    ok(my $dec = readlink("$decrypted/symlink"), "Symlink read, $decrypted/symlink -> $target");
     $dec.="";
     ok($dec eq $target, "Symlink compare, '$target' != '$dec'");
     my $return_code = ($have_xattr) ? system(@binattr, "$decrypted/symlink") : 0;