Fix conflict

Author: plague-doctor

pCloudCC/control_tools.cpp

@@ -1,7 +1,3 @@
-#include "control_tools.h"
-#include "pclsync_lib.h"
-#include "overlay_client.h"
-
 #include <iostream>
 
 #include <sys/types.h>
@@ -16,6 +12,10 @@
 #include <map>
 #include <string>
 
+#include "control_tools.h"
+#include "pclsync_lib.h"
+#include "overlay_client.h"
+
 namespace control_tools{
 
 static const int STOP = 0;
@@ -115,4 +115,4 @@ int daemonize(bool do_commands) {
   }
 }
 
-}
+}

pCloudCC/lib/pclsync/pfs.c

@@ -70,6 +70,10 @@ typedef off_t fuse_off_t;
 #include <sys/mount.h>
 #endif
 
+#if defined(P_OS_LINUX)
+#include <sys/mount.h>
+#endif
+
 #if IS_DEBUG
 #define psync_fs_set_thread_name() do {psync_thread_name=__FUNCTION__;} while (0)
 #else
@@ -2979,7 +2983,9 @@ static void *psync_fs_init(struct fuse_conn_info *conn){
   conn->want|=FUSE_CAP_BIG_WRITES;
 #endif
   conn->max_readahead=1024*1024;
+#if !defined(P_OS_LINUX)
   conn->max_write=FS_MAX_WRITE;
+#endif
   if (psync_start_callback)
     psync_timer_register(psync_fs_start_callback_timer, 1, NULL);
   return 0;
@@ -3198,6 +3204,13 @@ static void psync_fs_do_stop(void){
     unmount(psync_current_mountpoint, MNT_FORCE);
     debug(D_NOTICE, "unmount exited");
 #endif
+
+#if defined(P_OS_LINUX)
+	char *mp;
+	mp = psync_fuse_get_mountpoint();
+	fuse_unmount(mp, psync_fuse_channel);
+#endif
+
     debug(D_NOTICE, "running fuse_exit");
     fuse_exit(psync_fuse);
     started=2;
@@ -3307,6 +3320,29 @@ static void psync_fuse_thread(){
   pthread_mutex_unlock(&start_mutex);
 }
 
+// Returns true if FUSE 3 is installed on the user's machine.
+// Returns false if FUSE version is less than 3.
+static char is_fuse3_installed_on_system()
+{
+  // Assuming that fusermount3 is only available on FUSE 3.
+  FILE* pipe = popen("which fusermount3", "r");
+
+  if (!pipe) {
+    return 0;
+  }
+
+  char output[1024];
+  memset(output, 0, sizeof(output));
+
+  char* o = fgets(output, sizeof(output), pipe);
+
+  pclose(pipe);
+  size_t outlen = strlen(output);
+
+  return outlen > 0;
+}
+
+
 static int psync_fs_do_start(){
   char *mp;
   struct fuse_operations psync_oper;
@@ -3320,7 +3356,9 @@ static int psync_fs_do_start(){
   fuse_opt_add_arg(&args, "-oauto_unmount");
 //  fuse_opt_add_arg(&args, "-ouse_ino");
   fuse_opt_add_arg(&args, "-ofsname="DEFAULT_FUSE_MOUNT_POINT".fs");
-  fuse_opt_add_arg(&args, "-ononempty");
+  if (!is_fuse3_installed_on_system()) {
+    fuse_opt_add_arg(&args, "-ononempty");
+  }
   fuse_opt_add_arg(&args, "-ohard_remove");
 //  fuse_opt_add_arg(&args, "-d");
 #endif
@@ -3481,3 +3519,4 @@ int psync_fs_remount(){
   else
     return 0;
 }
+

pCloudCC/pclsync_lib.cpp

@@ -39,23 +39,19 @@
 namespace cc  = console_client;
 namespace clib  = cc::clibrary;
 
-#include <boost/shared_ptr.hpp>
 clib::pclsync_lib& clib::pclsync_lib::get_lib(){
   static clib::pclsync_lib g_lib;
-  return g_lib;
-}
-
-psync_timer_t exit_timer=NULL;
+  return g_lib;}
 
-static std::string exec(const char* cmd){
-    boost::shared_ptr<FILE> pipe(popen(cmd, "r"), pclose);
+static std::string exec(const char* cmd) {
     if (!pipe) return "ERROR";
     char buffer[128];
     std::string result = "";
-    while (!feof(pipe.get())) {
-        if (fgets(buffer, 128, pipe.get()) != NULL)
+    while (!feof(pipe)) {
+        if (fgets(buffer, 128, pipe) != NULL)
             result += buffer;
     }
+    pclose(pipe);
     return result;
 }
 
@@ -325,3 +321,4 @@ clib::pclsync_lib::pclsync_lib() : status_(new pstatus_struct_() ), was_init_(fa
 clib::pclsync_lib::~pclsync_lib(){
 }
 
+