From e329d3fef918bba72f545d8e2f2d09bb44dacbe4 Mon Sep 17 00:00:00 2001
From: Valient Gough <valient@gmail.com>
Date: Sun, 6 Aug 2017 17:48:02 -0700
Subject: [PATCH] cleanup: uniform context handling

---
 encfs/encfs.cpp | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/encfs/encfs.cpp b/encfs/encfs.cpp
index c8b72d6..b70083a 100644
--- a/encfs/encfs.cpp
+++ b/encfs/encfs.cpp
@@ -75,13 +75,7 @@ static EncFS_Context *context() {
  * Optionally takes a pointer to the EncFS_Context, will get it from FUSE
  * if the argument is NULL.
  */
-static bool isReadOnly(EncFS_Context *ctx) {
-  if (ctx == nullptr) {
-    ctx = (EncFS_Context *)fuse_get_context()->private_data;
-  }
-
-  return ctx->opts->readOnly;
-}
+static bool isReadOnly(EncFS_Context *ctx) { return ctx->opts->readOnly; }
 
 // helper function -- apply a functor to a cipher path, given the plain path
 static int withCipherPath(const char *opName, const char *path,
@@ -366,7 +360,6 @@ int encfs_mkdir(const char *path, mode_t mode) {
 
 int encfs_unlink(const char *path) {
   EncFS_Context *ctx = context();
-
   if (isReadOnly(ctx)) {
     return -EROFS;
   }
@@ -392,7 +385,8 @@ int _do_rmdir(EncFS_Context *, const string &cipherPath) {
 }
 
 int encfs_rmdir(const char *path) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withCipherPath("rmdir", path, bind(_do_rmdir, _1, _2));
@@ -533,7 +527,8 @@ int _do_chmod(EncFS_Context *, const string &cipherPath, mode_t mode) {
 }
 
 int encfs_chmod(const char *path, mode_t mode) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withCipherPath("chmod", path, bind(_do_chmod, _1, _2, mode));
@@ -545,7 +540,8 @@ int _do_chown(EncFS_Context *, const string &cyName, uid_t u, gid_t g) {
 }
 
 int encfs_chown(const char *path, uid_t uid, gid_t gid) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withCipherPath("chown", path, bind(_do_chown, _1, _2, uid, gid));
@@ -554,14 +550,16 @@ int encfs_chown(const char *path, uid_t uid, gid_t gid) {
 int _do_truncate(FileNode *fnode, off_t size) { return fnode->truncate(size); }
 
 int encfs_truncate(const char *path, off_t size) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withFileNode("truncate", path, nullptr, bind(_do_truncate, _1, size));
 }
 
 int encfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withFileNode("ftruncate", path, fi, bind(_do_truncate, _1, size));
@@ -573,7 +571,8 @@ int _do_utime(EncFS_Context *, const string &cyName, struct utimbuf *buf) {
 }
 
 int encfs_utime(const char *path, struct utimbuf *buf) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withCipherPath("utime", path, bind(_do_utime, _1, _2, buf));
@@ -596,7 +595,8 @@ int _do_utimens(EncFS_Context *, const string &cyName,
 }
 
 int encfs_utimens(const char *path, const struct timespec ts[2]) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withCipherPath("utimens", path, bind(_do_utimens, _1, _2, ts));
@@ -705,7 +705,8 @@ int _do_fsync(FileNode *fnode, int dataSync) {
 }
 
 int encfs_fsync(const char *path, int dataSync, struct fuse_file_info *file) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withFileNode("fsync", path, file, bind(_do_fsync, _1, dataSync));
@@ -720,7 +721,8 @@ int _do_write(FileNode *fnode, unsigned char *ptr, size_t size, off_t offset) {
 
 int encfs_write(const char *path, const char *buf, size_t size, off_t offset,
                 struct fuse_file_info *file) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withFileNode("write", path, file,
@@ -762,7 +764,10 @@ int _do_setxattr(EncFS_Context *, const string &cyName, const char *name,
 }
 int encfs_setxattr(const char *path, const char *name, const char *value,
                    size_t size, int flags, uint32_t position) {
-  if (isReadOnly(NULL)) return -EROFS;
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
+    return -EROFS;
+  }
   (void)flags;
   return withCipherPath("setxattr", path, bind(_do_setxattr, _1, _2, name,
                                                value, size, position));
@@ -774,7 +779,8 @@ int _do_setxattr(EncFS_Context *, const string &cyName, const char *name,
 }
 int encfs_setxattr(const char *path, const char *name, const char *value,
                    size_t size, int flags) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }
   return withCipherPath("setxattr", path,
@@ -834,7 +840,8 @@ int _do_removexattr(EncFS_Context *, const string &cyName, const char *name) {
 }
 
 int encfs_removexattr(const char *path, const char *name) {
-  if (isReadOnly(nullptr)) {
+  EncFS_Context *ctx = context();
+  if (isReadOnly(ctx)) {
     return -EROFS;
   }