From aa7107ab1d98d1f9c3dac9d5f52b2b9a5f815ba4 Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:02:14 -0400 Subject: [PATCH 1/9] Update Makefile --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 40bacea..62a4857 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,9 @@ OBJ = $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(SRC))) INCLUDES = -I inc -I /usr/include/cryptopp -I sdk # C compiler flags (-g -O2 -Wall) -CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions +CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions CCFLAGS += $(shell pkg-config --cflags libcurl fuse) +CCFLAGS += -static CPPFLAGS = -std=c++0x $(CCFLAGS) -D_GLIBCXX_DEBUG # compiler @@ -29,8 +30,9 @@ CXX= g++ LIBS = # compile flags -LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx +LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx LDFLAGS += $(shell pkg-config --libs libcurl fuse) +LDFLAGS += -static megafuse: $(OUT) From d5386b73d899dc0dd5da1f4ae15b2d8ce2dedbc5 Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:04:44 -0400 Subject: [PATCH 2/9] Update file_cache_row.cpp --- src/file_cache_row.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/file_cache_row.cpp b/src/file_cache_row.cpp index 4d0e096..a299272 100644 --- a/src/file_cache_row.cpp +++ b/src/file_cache_row.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -69,7 +70,7 @@ int CacheManager::numChunks(size_t pos) end +=i*ChunkedHash::SEGSIZE; if(end >= pos) return i; } - return 8 + ceil(float(pos-end)/(8.0*ChunkedHash::SEGSIZE)); + return 8 + std::ceil(float(pos-end)/(8.0*ChunkedHash::SEGSIZE)); } From ffae1e9926607f7dd7d062460fdac126c777029f Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:07:34 -0400 Subject: [PATCH 3/9] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 62a4857..2dbe82a 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ LIBS = # compile flags LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx LDFLAGS += $(shell pkg-config --libs libcurl fuse) -LDFLAGS += -static + megafuse: $(OUT) From 07e91696a3d8e670e3d21d3cbbc7554566f8e9b5 Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:09:34 -0400 Subject: [PATCH 4/9] Update Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2dbe82a..a9207e5 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ INCLUDES = -I inc -I /usr/include/cryptopp -I sdk # C compiler flags (-g -O2 -Wall) CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions CCFLAGS += $(shell pkg-config --cflags libcurl fuse) -CCFLAGS += -static CPPFLAGS = -std=c++0x $(CCFLAGS) -D_GLIBCXX_DEBUG # compiler @@ -32,7 +31,7 @@ LIBS = # compile flags LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx LDFLAGS += $(shell pkg-config --libs libcurl fuse) - +LDFLAGS += -static megafuse: $(OUT) From e1f215a0d15df9406d82f3a4d4eb1e77fa24f9b0 Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:14:51 -0400 Subject: [PATCH 5/9] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index a9207e5..c420193 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ LIBS = # compile flags LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx LDFLAGS += $(shell pkg-config --libs libcurl fuse) -LDFLAGS += -static megafuse: $(OUT) From 65bded906e5849dd995134c98c2daf32966bb72d Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:26:21 -0400 Subject: [PATCH 6/9] Update Makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c420193..4b80de0 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,9 @@ OBJ = $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(SRC))) INCLUDES = -I inc -I /usr/include/cryptopp -I sdk # C compiler flags (-g -O2 -Wall) -CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions +CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions CCFLAGS += $(shell pkg-config --cflags libcurl fuse) +CCFLAGS = -static CPPFLAGS = -std=c++0x $(CCFLAGS) -D_GLIBCXX_DEBUG # compiler @@ -31,6 +32,7 @@ LIBS = # compile flags LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx LDFLAGS += $(shell pkg-config --libs libcurl fuse) +LDFLAGS += -static megafuse: $(OUT) From 47068b773face40e642d033c5d6ba0c2b5f535c5 Mon Sep 17 00:00:00 2001 From: Davod Date: Sun, 2 Jun 2019 02:27:15 -0400 Subject: [PATCH 7/9] Update Makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 4b80de0..b09ff72 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ INCLUDES = -I inc -I /usr/include/cryptopp -I sdk # C compiler flags (-g -O2 -Wall) CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions CCFLAGS += $(shell pkg-config --cflags libcurl fuse) -CCFLAGS = -static CPPFLAGS = -std=c++0x $(CCFLAGS) -D_GLIBCXX_DEBUG # compiler @@ -32,7 +31,6 @@ LIBS = # compile flags LDFLAGS = -lcryptopp -lfreeimage -ldb_cxx LDFLAGS += $(shell pkg-config --libs libcurl fuse) -LDFLAGS += -static megafuse: $(OUT) From aece89c07c0cf3711dd70d828d0bcaede4cb58c6 Mon Sep 17 00:00:00 2001 From: Davod Date: Mon, 3 Jun 2019 21:07:06 -0400 Subject: [PATCH 8/9] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b09ff72..e80bb4e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ OBJ = $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(SRC))) INCLUDES = -I inc -I /usr/include/cryptopp -I sdk # C compiler flags (-g -O2 -Wall) -CCFLAGS = -O0 -g -fstack-protector-all -Wall #-non-call-exceptions +CCFLAGS = -Os -g -fstack-protector-all -Wall #-non-call-exceptions CCFLAGS += $(shell pkg-config --cflags libcurl fuse) CPPFLAGS = -std=c++0x $(CCFLAGS) -D_GLIBCXX_DEBUG From 39e68ba53453db873d0619db90d38a6d4c68742b Mon Sep 17 00:00:00 2001 From: Davod Date: Thu, 6 Jun 2019 00:06:54 -0400 Subject: [PATCH 9/9] Update Config.cpp --- src/Config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index 2b57390..de7c291 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -15,14 +15,14 @@ Config* Config::getInstance() void Config::check_variable(int &var,std::string value,std::string name) { var=stoi(value); - printf("caricata la variabile %s con il valore %d\n",name.c_str(),var); + printf("Creating the variable %s with value %d\n",name.c_str(),var); } void Config::check_variable(std::string &var,std::string value,std::string name) { var = value; - printf("caricata la variabile %s con il valore %s\n",name.c_str(),value.c_str()); + printf("reating the variable %s with value %s\n",name.c_str(),value.c_str()); }