From: Timo Sirainen <tss@iki.fi>
Date: Tue, 5 May 2015 10:35:52 +0000 (+0300)
Subject: doveadm fs delete: Another attempt at fixing recursive deletion.
X-Git-Tag: 2.2.17.rc1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f942b7b96a5c3c6756a6ea7bc3de0cd01bcb07fb;p=thirdparty%2Fdovecot%2Fcore.git

doveadm fs delete: Another attempt at fixing recursive deletion.
I'm not entirely sure anymore what the original infinite looping was, but
this fixes all the potential problems that I see.
---

diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c
index 378916e59a..2543e5b4d9 100644
--- a/src/doveadm/doveadm-fs.c
+++ b/src/doveadm/doveadm-fs.c
@@ -225,20 +225,22 @@ struct fs_delete_ctx {
 static bool cmd_fs_delete_ctx_run(struct fs_delete_ctx *ctx)
 {
 	unsigned int i;
-	bool ret = FALSE;
+	int ret = 0;
 
 	for (i = 0; i < ctx->files_count; i++) {
 		if (ctx->files[i] == NULL)
 			;
 		else if (fs_delete(ctx->files[i]) == 0)
 			fs_file_deinit(&ctx->files[i]);
-		else if (errno == EAGAIN)
-			ret = TRUE;
-		else {
+		else if (errno == EAGAIN) {
+			if (ret == 0)
+				ret = 1;
+		} else {
 			i_error("fs_delete(%s) failed: %s",
 				fs_file_path(ctx->files[i]),
 				fs_file_last_error(ctx->files[i]));
 			doveadm_exit_code = EX_TEMPFAIL;
+			ret = -1;
 		}
 	}
 	return ret;
@@ -253,6 +255,7 @@ cmd_fs_delete_dir_recursive(struct fs *fs, unsigned int async_count,
 	struct fs_delete_ctx ctx;
 	const char *fname, *const *fnamep;
 	unsigned int i;
+	int ret;
 
 	memset(&ctx, 0, sizeof(ctx));
 	ctx.files_count = I_MAX(async_count, 1);
@@ -311,9 +314,10 @@ cmd_fs_delete_dir_recursive(struct fs *fs, unsigned int async_count,
 			fname = NULL;
 			break;
 		}
-		cmd_fs_delete_ctx_run(&ctx);
+		if ((ret = cmd_fs_delete_ctx_run(&ctx)) < 0)
+			break;
 		if (fname != NULL) {
-			if (fs_wait_async(fs) < 0) {
+			if (ret > 0 && fs_wait_async(fs) < 0) {
 				i_error("fs_wait_async() failed: %s", fs_last_error(fs));
 				doveadm_exit_code = EX_TEMPFAIL;
 				break;
@@ -321,7 +325,7 @@ cmd_fs_delete_dir_recursive(struct fs *fs, unsigned int async_count,
 			goto retry;
 		}
 	} T_END;
-	while (doveadm_exit_code == 0 && cmd_fs_delete_ctx_run(&ctx)) {
+	while (doveadm_exit_code == 0 && cmd_fs_delete_ctx_run(&ctx) != 0) {
 		if (fs_wait_async(fs) < 0) {
 			i_error("fs_wait_async() failed: %s", fs_last_error(fs));
 			doveadm_exit_code = EX_TEMPFAIL;