From e1faa90351d3aedcd154cf155f84438ec959aa52 Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Mon, 31 Jan 2022 10:13:19 +1100
Subject: [PATCH 1/2] If a sync_list exclusion is matched, the item needs to be
 excluded when using --resync (#1820)

* If a sync_list exclusion is matched, the item needs to be excluded when using --resync
---
 src/selective.d | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/selective.d b/src/selective.d
index 6b589d4d..d401dc22 100644
--- a/src/selective.d
+++ b/src/selective.d
@@ -373,6 +373,11 @@ private bool isPathExcluded(string path, string[] allowedPaths)
 	log.vdebug("[F]exclude        = ", exclude);
 	log.vdebug("[F]excludeMatched = ", excludeMatched);
 	
+	// If exclude or excludeMatched is true, then finalResult has to be true
+	if ((exclude) || (excludeMatched)) {
+		finalResult = true;
+	}
+	
 	// results
 	if (finalResult) {
 		log.vdebug("Evaluation against 'sync_list' final result: EXCLUDED");

From 220a00bbdf917ebeebc3e3456b6368802d2fea6a Mon Sep 17 00:00:00 2001
From: jydidier <jydidier@free.fr>
Date: Tue, 1 Feb 2022 01:39:14 +0100
Subject: [PATCH 2/2] Fixes in order to compile on an Android host (#1823)

* Fixes in order to compile on an Android host

Co-authored-by: Jean-Yves Didier <jeanyves.didier@univ-evry.fr>
---
 src/arsd/cgi.d | 9 ++++++++-
 src/main.d     | 2 +-
 src/progress.d | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/arsd/cgi.d b/src/arsd/cgi.d
index e8d4e009..56fe83ad 100644
--- a/src/arsd/cgi.d
+++ b/src/arsd/cgi.d
@@ -7711,7 +7711,11 @@ void runAddonServer(EIS)(string localListenerName, EIS eis) if(is(EIS : EventIoS
 				void newConnection() {
 					// on edge triggering, it is important that we get it all
 					while(true) {
-						auto size = cast(uint) addr.sizeof;
+						version(Android) {
+							auto size = cast(int) addr.sizeof;
+						} else {
+							auto size = cast(uint) addr.sizeof;
+						}
 						auto ns = accept(sock, cast(sockaddr*) &addr, &size);
 						if(ns == -1) {
 							if(errno == EAGAIN || errno == EWOULDBLOCK) {
@@ -7845,6 +7849,7 @@ ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd) {
 	version(OSX) {
 		//msg.msg_accrights = cast(cattr_t) &sendfd;
 		//msg.msg_accrightslen = int.sizeof;
+	} else version(Android) {
 	} else {
 		union ControlUnion {
 			cmsghdr cm;
@@ -7886,6 +7891,7 @@ ssize_t read_fd(int fd, void *ptr, size_t nbytes, int *recvfd) {
 	version(OSX) {
 		//msg.msg_accrights = cast(cattr_t) recvfd;
 		//msg.msg_accrightslen = int.sizeof;
+	} else version(Android) {
 	} else {
 		union ControlUnion {
 			cmsghdr cm;
@@ -7912,6 +7918,7 @@ ssize_t read_fd(int fd, void *ptr, size_t nbytes, int *recvfd) {
 	version(OSX) {
 		//if(msg.msg_accrightslen != int.sizeof)
 			//*recvfd = -1;
+	} else version(Android) {
 	} else {
 		if ( (cmptr = CMSG_FIRSTHDR(&msg)) != null &&
 				cmptr.cmsg_len == CMSG_LEN(int.sizeof)) {
diff --git a/src/main.d b/src/main.d
index be688cfe..e9575239 100644
--- a/src/main.d
+++ b/src/main.d
@@ -4,7 +4,7 @@ import std.getopt, std.file, std.path, std.process, std.stdio, std.conv, std.alg
 import config, itemdb, monitor, onedrive, selective, sync, util;
 import std.net.curl: CurlException;
 import core.stdc.signal;
-import std.traits;
+import std.traits, std.format;
 import std.concurrency: receiveTimeout;
 static import log;
 
diff --git a/src/progress.d b/src/progress.d
index c07a43d0..9277ae12 100644
--- a/src/progress.d
+++ b/src/progress.d
@@ -24,6 +24,7 @@ class Progress
     size_t getTerminalWidth() {
       size_t column = default_width;
       version (CRuntime_Musl) {
+	  } else version(Android) {
       } else {
 	winsize ws;
 	if(ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && ws.ws_col > 0) {