[dovecot-cvs] dovecot/src/pop3 client.c,1.48,1.49 main.c,1.22,1.23
cras at dovecot.org
cras at dovecot.org
Sun Apr 3 14:36:23 EEST 2005
Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv4553/pop3
Modified Files:
client.c main.c
Log Message:
Moved several getenv()s from lib-storage to main code. deliver binary was
missing several getenvs..
Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/client.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- client.c 29 Mar 2005 13:33:09 -0000 1.48
+++ client.c 3 Apr 2005 11:36:21 -0000 1.49
@@ -151,8 +151,6 @@
flags = 0;
if (no_flag_updates)
flags |= MAILBOX_OPEN_KEEP_RECENT;
- if ((uidl_keymask & UIDL_MD5) != 0)
- flags |= MAILBOX_OPEN_KEEP_HEADER_MD5;
client->mailbox = mailbox_open(storage, "INBOX", NULL, flags);
if (client->mailbox == NULL) {
i_error("Couldn't open INBOX: %s",
Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- main.c 29 Dec 2004 19:24:00 -0000 1.22
+++ main.c 3 Apr 2005 11:36:21 -0000 1.23
@@ -142,8 +142,9 @@
static int main_init(void)
{
enum mail_storage_flags flags;
+ enum mail_storage_lock_method lock_method;
struct mail_storage *storage;
- const char *mail;
+ const char *str, *mail;
lib_init_signals(sig_quit);
@@ -183,8 +184,29 @@
flags |= MAIL_STORAGE_FLAG_FULL_FS_ACCESS;
if (getenv("DEBUG") != NULL)
flags |= MAIL_STORAGE_FLAG_DEBUG;
+ if (getenv("MMAP_DISABLE") != NULL)
+ flags |= MAIL_STORAGE_FLAG_MMAP_DISABLE;
+ if (getenv("MMAP_NO_WRITE") != NULL)
+ flags |= MAIL_STORAGE_FLAG_MMAP_NO_WRITE;
+ if (getenv("MAIL_READ_MMAPED") != NULL)
+ flags |= MAIL_STORAGE_FLAG_MMAP_MAILS;
+ if (getenv("MAIL_SAVE_CRLF") != NULL)
+ flags |= MAIL_STORAGE_FLAG_SAVE_CRLF;
+ if ((uidl_keymask & UIDL_MD5) != 0)
+ flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;
- storage = mail_storage_create_with_data(mail, getenv("USER"), flags);
+ str = getenv("LOCK_METHOD");
+ if (str == NULL || strcmp(str, "fcntl") == 0)
+ lock_method = MAIL_STORAGE_LOCK_FCNTL;
+ else if (strcmp(str, "flock") == 0)
+ lock_method = MAIL_STORAGE_LOCK_FLOCK;
+ else if (strcmp(str, "dotlock") == 0)
+ lock_method = MAIL_STORAGE_LOCK_DOTLOCK;
+ else
+ i_fatal("Unknown lock_method: %s", str);
+
+ storage = mail_storage_create_with_data(mail, getenv("USER"),
+ flags, lock_method);
if (storage == NULL) {
/* failed */
if (mail != NULL && *mail != '\0')
More information about the dovecot-cvs
mailing list