[dovecot-cvs] dovecot/src/imap cmd-fetch.c, 1.28, 1.29 commands-util.c, 1.45, 1.46 imap-search.c, 1.12, 1.13

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv30221/imap

Modified Files:
	cmd-fetch.c commands-util.c imap-search.c 
Log Message:
Added separate "temporary error" flag for mail_storage_get_last_error().



Index: cmd-fetch.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-fetch.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cmd-fetch.c	14 Mar 2005 21:17:58 -0000	1.28
+++ cmd-fetch.c	29 Jul 2005 08:43:04 -0000	1.29
@@ -83,10 +83,11 @@
 	if (failed || (partial && !cmd->uid)) {
 		struct mail_storage *storage;
 		const char *error;
-		int syntax;
+		int syntax, temporary_error;
 
                 storage = mailbox_get_storage(cmd->client->mailbox);
-		error = mail_storage_get_last_error(storage, &syntax);
+		error = mail_storage_get_last_error(storage, &syntax,
+						    &temporary_error);
 		if (!syntax) {
 			/* We never want to reply NO to FETCH requests,
 			   BYE is preferrable (see imap-ml for reasons). */

Index: commands-util.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/commands-util.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- commands-util.c	23 Jul 2005 10:13:54 -0000	1.45
+++ commands-util.c	29 Jul 2005 08:43:04 -0000	1.46
@@ -118,7 +118,7 @@
 			       struct mail_storage *storage)
 {
 	const char *error;
-	int syntax;
+	int syntax, temporary_error;
 
 	if (cmd->client->mailbox != NULL &&
 	    mailbox_is_inconsistent(cmd->client->mailbox)) {
@@ -128,7 +128,7 @@
 		return;
 	}
 
-	error = mail_storage_get_last_error(storage, &syntax);
+	error = mail_storage_get_last_error(storage, &syntax, &temporary_error);
 	client_send_tagline(cmd,
 			    t_strconcat(syntax ? "BAD " : "NO ", error, NULL));
 }
@@ -137,7 +137,7 @@
 					struct mail_storage *storage)
 {
 	const char *error;
-	int syntax;
+	int syntax, temporary_error;
 
 	if (client->mailbox != NULL &&
 	    mailbox_is_inconsistent(client->mailbox)) {
@@ -147,7 +147,7 @@
 		return;
 	}
 
-	error = mail_storage_get_last_error(storage, &syntax);
+	error = mail_storage_get_last_error(storage, &syntax, &temporary_error);
 	client_send_line(client,
 			 t_strconcat(syntax ? "* BAD " : "* NO ", error, NULL));
 }

Index: imap-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/imap-search.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- imap-search.c	12 Jul 2005 12:47:11 -0000	1.12
+++ imap-search.c	29 Jul 2005 08:43:04 -0000	1.13
@@ -18,7 +18,7 @@
 		  struct mail_search_seqset **seqset_r, const char **error_r)
 {
 	struct mail_search_seqset *seqset, **p;
-	int syntax, last;
+	int syntax, temporary, last;
 
 	*seqset_r = imap_messageset_parse(pool, uidset);
 	if (*seqset_r == NULL) {
@@ -38,7 +38,8 @@
 				     &seqset->seq1, &seqset->seq2) < 0) {
 			struct mail_storage *storage = mailbox_get_storage(box);
 			*error_r = mail_storage_get_last_error(storage,
-							       &syntax);
+							       &syntax,
+							       &temporary);
 			return -1;
 		}