From 1cdab3af0d1a53f75700ff437a59756052a403d8 Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@mit.edu>
Date: Mon, 22 Feb 2016 22:55:01 -0500
Subject: Use -o nonempty by default

---
 src/scoville.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/scoville.cc b/src/scoville.cc
index 2b79cf6..2eff02e 100644
--- a/src/scoville.cc
+++ b/src/scoville.cc
@@ -16,6 +16,7 @@
 
 #include <memory>
 #include <system_error>
+#include <vector>
 
 #include <fcntl.h>
 #include <gflags/gflags.h>
@@ -49,5 +50,12 @@ int main(int argc, char* argv[]) {
   }
   LOG(INFO) << "overlaying " << root->path();
   const fuse_operations operations = scoville::FuseOperations(root.get());
-  return fuse_main(argc, argv, &operations, nullptr);
+
+  // Add -o nonempty to argv so FUSE won't complain about overlaying.
+  char hyphen_o[] = "-o";
+  char nonempty[] = "nonempty";
+  std::vector<char*> new_argv(argv, argv + argc);
+  new_argv.emplace_back(hyphen_o);
+  new_argv.emplace_back(nonempty);
+  return fuse_main(new_argv.size(), new_argv.data(), &operations, nullptr);
 }
-- 
cgit v1.2.3