From 0a3b596492f5d02363f334509c5055ea76f6e1b6 Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Sun, 18 Aug 2024 15:09:21 +0200
Subject: [PATCH] Merge pclsync and poverlay_linux (#46)

* fixed 2 of the 3 memory leaks

* fixed more memleaks

* more leaks

* another one

* BUGHUNT mode to look for more mem leaks

* merge poverlay_linux and pclsync
---
 Makefile                                     | 4 ++--
 {poverlay_linux => pclsync}/debug.c          | 0
 {poverlay_linux => pclsync}/debug.h          | 0
 {poverlay_linux => pclsync}/overlay_client.c | 0
 {poverlay_linux => pclsync}/overlay_client.h | 0
 {poverlay_linux => pclsync}/sockets.h        | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename {poverlay_linux => pclsync}/debug.c (100%)
 rename {poverlay_linux => pclsync}/debug.h (100%)
 rename {poverlay_linux => pclsync}/overlay_client.c (100%)
 rename {poverlay_linux => pclsync}/overlay_client.h (100%)
 rename {poverlay_linux => pclsync}/sockets.h (100%)

diff --git a/Makefile b/Makefile
index d3673f9..1566f60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-CFLAGS=-fPIC -Wall -O0 -g -fsanitize=address -I./pclsync -I./poverlay_linux -I/usr/include -I/usr/include/mbedtls2
+CFLAGS=-fPIC -Wall -O0 -g -fsanitize=address -I./pclsync -I/usr/include -I/usr/include/mbedtls2
 LDFLAGS=-lboost_program_options -lssl -lcrypto -lfuse -lpthread -ludev -lsqlite3 -lz -l:libmbedtls.so.14 -l:libmbedx509.so.1 -l:libmbedcrypto.so.7 
 CMDSRC=control_tools.cpp pclsync_lib_c.cpp pclsync_lib.cpp main.cpp
 DESTDIR=/usr/local
-LIBSRC=$(wildcard pclsync/*.c poverlay_linux/*.c)
+LIBSRC=$(wildcard pclsync/*.c)
 LIBOBJ = $(LIBOBJ:%.c=%.o)
 
 all: libpcloudcc_lib.so pcloudcc
diff --git a/poverlay_linux/debug.c b/pclsync/debug.c
similarity index 100%
rename from poverlay_linux/debug.c
rename to pclsync/debug.c
diff --git a/poverlay_linux/debug.h b/pclsync/debug.h
similarity index 100%
rename from poverlay_linux/debug.h
rename to pclsync/debug.h
diff --git a/poverlay_linux/overlay_client.c b/pclsync/overlay_client.c
similarity index 100%
rename from poverlay_linux/overlay_client.c
rename to pclsync/overlay_client.c
diff --git a/poverlay_linux/overlay_client.h b/pclsync/overlay_client.h
similarity index 100%
rename from poverlay_linux/overlay_client.h
rename to pclsync/overlay_client.h
diff --git a/poverlay_linux/sockets.h b/pclsync/sockets.h
similarity index 100%
rename from poverlay_linux/sockets.h
rename to pclsync/sockets.h