[dovecot-cvs] dovecot/src/pop3 commands.c, 1.36, 1.37 common.h, 1.7, 1.8 main.c, 1.19, 1.20

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv13637/src/pop3

Modified Files:
	commands.c common.h main.c 
Log Message:
Added %f pop3_uidl_format for maildir. Patch by Andrey Panin.



Index: commands.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/commands.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- commands.c	15 Dec 2004 20:05:19 -0000	1.36
+++ commands.c	19 Dec 2004 06:36:13 -0000	1.37
@@ -483,6 +483,7 @@
 		{ 'v', NULL },
 		{ 'u', NULL },
 		{ 'm', NULL },
+		{ 'f', NULL },
 		{ '\0', NULL }
 	};
 	struct var_expand_table *tab;
@@ -512,6 +513,11 @@
 			tab[2].value =
 				mail->get_special(mail, MAIL_FETCH_HEADER_MD5);
 		}
+		if ((uidl_keymask & UIDL_FILE_NAME) != 0) {
+			tab[3].value =
+				mail->get_special(mail,
+						  MAIL_FETCH_UIDL_FILE_NAME);
+		}
 
 		str_truncate(str, 0);
 		str_printfa(str, ctx->message == 0 ? "%u " : "+OK %u ",

Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/common.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common.h	15 Dec 2004 20:05:19 -0000	1.7
+++ common.h	19 Dec 2004 06:36:13 -0000	1.8
@@ -12,7 +12,8 @@
 enum uidl_keys {
 	UIDL_UIDVALIDITY	= 0x01,
 	UIDL_UID		= 0x02,
-	UIDL_MD5		= 0x04
+	UIDL_MD5		= 0x04,
+	UIDL_FILE_NAME		= 0x08
 };
 
 extern struct ioloop *ioloop;

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- main.c	15 Dec 2004 20:05:19 -0000	1.19
+++ main.c	19 Dec 2004 06:36:13 -0000	1.20
@@ -87,6 +87,9 @@
 			case 'm':
 				mask |= UIDL_MD5;
 				break;
+			case 'f':
+				mask |= UIDL_FILE_NAME;
+				break;
 			}
 		}
 	}