lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19d86d2aa9
isync/src/config.c

490 lines
13 KiB
C
Raw Normal View History

The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
/*
* mbsync - mailbox synchronizer
- update copyrights. 2003 didn't begin yet, but who cares? :)
2002-12-28 15:31:20 +00:00
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
update copyrights make the wrapper's help string also mention copyrights pertaining only to the actual syncer, as this is the only string many people will ever see.
2011-04-10 17:25:46 +00:00
* Copyright (C) 2002-2006,2011 Oswald Buddenhagen <ossi@users.sf.net>
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
replace FSF address with something more ... contemporary
2011-04-10 17:34:36 +00:00
* along with this program. If not, see <http://www.gnu.org/licenses/>.
trailing whitespace
2005-12-18 13:41:50 +00:00
*
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
* As a special exception, mbsync may be linked with the OpenSSL library,
Updated the copyright notice to allow an exception for linking with OpenSSL, which has a non-GPL compatible license.
2002-10-30 02:31:20 +00:00
* despite that library's more restrictive license.
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
*/
reshuffle sources a bit split header and move some code to more logical places.
2013-12-08 19:46:40 +00:00
#include "config.h"
#include "sync.h"
- make it work without SSL - switch from -Ds in Makefile to config.h - small header cleaup
2003-05-07 00:06:37 +00:00
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
#include <assert.h>
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
#include <unistd.h>
#include <limits.h>
#include <pwd.h>
#include <sys/types.h>
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
#include <ctype.h>
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
#include <string.h>
fixed compiler warnings under Solaris 2.7
2001-02-28 01:02:50 +00:00
#include <stdlib.h>
update version to 0.7 detect short write in write_strip() fix compilation warnings with gcc-2.95.4
2001-11-09 00:23:50 +00:00
#include <stdio.h>
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
store_conf_t *stores;
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
#define ARG_OPTIONAL 0
#define ARG_REQUIRED 1
static char *
get_arg( conffile_t *cfile, int required, int *comment )
{
char *ret, *p, *t;
support backslash-escaping in the config file note that no attempt is made at making this work in the compat wrapper.
2013-09-25 18:56:52 +00:00
int escaped, quoted;
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
char c;
p = cfile->rest;
assert( p );
while ((c = *p) && isspace( (unsigned char) c ))
p++;
if (!c || c == '#') {
if (comment)
*comment = (c == '#');
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
if (required) {
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
error( "%s:%d: parameter missing\n", cfile->file, cfile->line );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
}
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
ret = 0;
} else {
support backslash-escaping in the config file note that no attempt is made at making this work in the compat wrapper.
2013-09-25 18:56:52 +00:00
for (escaped = 0, quoted = 0, ret = t = p; c; c = *p) {
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
p++;
support backslash-escaping in the config file note that no attempt is made at making this work in the compat wrapper.
2013-09-25 18:56:52 +00:00
if (escaped && c >= 32) {
escaped = 0;
*t++ = c;
} else if (c == '\\')
escaped = 1;
else if (c == '"')
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
quoted ^= 1;
else if (!quoted && isspace( (unsigned char) c ))
break;
else
*t++ = c;
}
*t = 0;
support backslash-escaping in the config file note that no attempt is made at making this work in the compat wrapper.
2013-09-25 18:56:52 +00:00
if (escaped) {
error( "%s:%d: unterminated escape sequence\n", cfile->file, cfile->line );
cfile->err = 1;
ret = 0;
}
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
if (quoted) {
error( "%s:%d: missing closing quote\n", cfile->file, cfile->line );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
ret = 0;
}
}
cfile->rest = p;
return ret;
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
int
parse_bool( conffile_t *cfile )
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
{
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (!strcasecmp( cfile->val, "yes" ) ||
!strcasecmp( cfile->val, "true" ) ||
!strcasecmp( cfile->val, "on" ) ||
!strcmp( cfile->val, "1" ))
return 1;
if (strcasecmp( cfile->val, "no" ) &&
strcasecmp( cfile->val, "false" ) &&
strcasecmp( cfile->val, "off" ) &&
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
strcmp( cfile->val, "0" )) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: invalid boolean value '%s'\n",
cfile->file, cfile->line, cfile->val );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 0;
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
int
parse_int( conffile_t *cfile )
move strndup() code into config.c for less complexity change AC_REPLACE_FUNC(strndup) to AC_CHECK_FUNCS(strndup) sed expression checking for gcc-3.0 should be quoted beccause it fails under Solaris 2.7
2001-11-14 17:40:10 +00:00
{
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
char *p;
int ret;
trailing whitespace
2005-12-18 13:41:50 +00:00
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
ret = strtol( cfile->val, &p, 10 );
if (*p) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: invalid integer value '%s'\n",
cfile->file, cfile->line, cfile->val );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 0;
}
return ret;
move strndup() code into config.c for less complexity change AC_REPLACE_FUNC(strndup) to AC_CHECK_FUNCS(strndup) sed expression checking for gcc-3.0 should be quoted beccause it fails under Solaris 2.7
2001-11-14 17:40:10 +00:00
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
int
parse_size( conffile_t *cfile )
added support for tilde (~) expansion in the `Mailbox' and `CertificateFile' configuration directives added `Maildir' configuration command to specify the default location of the user's mailboxes. If a relative path is used in a `Mailbox' command, this path is used as a prefix.
2001-01-16 19:45:08 +00:00
{
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
char *p;
int ret;
added support for tilde (~) expansion in the `Mailbox' and `CertificateFile' configuration directives added `Maildir' configuration command to specify the default location of the user's mailboxes. If a relative path is used in a `Mailbox' command, this path is used as a prefix.
2001-01-16 19:45:08 +00:00
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
ret = strtol (cfile->val, &p, 10);
if (*p == 'k' || *p == 'K')
ret *= 1024, p++;
else if (*p == 'm' || *p == 'M')
ret *= 1024 * 1024, p++;
if (*p == 'b' || *p == 'B')
strndup() could return a non-NULL terminated string size_t should be printed with %lu when expending tildes (~), an extra slash was inserted after the user's home directory
2001-11-13 00:36:44 +00:00
p++;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (*p) {
fprintf (stderr, "%s:%d: invalid size '%s'\n",
cfile->file, cfile->line, cfile->val);
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 0;
added support for tilde (~) expansion in the `Mailbox' and `CertificateFile' configuration directives added `Maildir' configuration command to specify the default location of the user's mailboxes. If a relative path is used in a `Mailbox' command, this path is used as a prefix.
2001-01-16 19:45:08 +00:00
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return ret;
added support for tilde (~) expansion in the `Mailbox' and `CertificateFile' configuration directives added `Maildir' configuration command to specify the default location of the user's mailboxes. If a relative path is used in a `Mailbox' command, this path is used as a prefix.
2001-01-16 19:45:08 +00:00
}
trailing whitespace
2005-12-18 13:41:50 +00:00
static int
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
getopt_helper( conffile_t *cfile, int *cops, channel_conf_t *conf )
Bunch 'o patches from Oswald Buddenhagen: i implemented some cool stuff (tm). first, the long missing "create server-side missing mailboxes". -C now creates both local and remote boxes; -L and -R create only local/remote. second, i implemented a 1:1 remote:local folder mapping (-1) with an optional INBOX exception (inbox/-I). the remote folder is specified with the folder keyword (or -F switch) and takes precedence over the namespace setting. the local directory with the mailboxes can now be specified on the command line, too (-M). another patch: - made the -1 switch settable permanently (OneToOne). after all, you usually define your mailbox layout once forever. removed -A, as it is semantically -a modified by -1. - cleaned up message output a bit. still, the quiet variable should be used throughout the program. at best, create some generic output function, which obeys a global verbosity level variable. - optimized + cleaned up configuration parser slightly - minor cleanups add an (almost) unique id to every uploaded message and search for it right after. i thought about using the message-id, but a) it is not guaranteed to be unique in a mailbox (imagine you edit a mail and store the dupe in the same box) and b) some mails (e.g., postponed) don't even have one. a downside of the current implementation is, that this id-header remains in the mailbox, but given that it wastes only 27 bytes per mail and removing it would mean several roundtrips more, this seems acceptable. i changed the line-counting loop to use a mmapped file instead of reading it in chunks, as it makes things simpler and is probably even faster for big mails. the amount of goto statements in my code may be scary, but c is simply lacking a multi-level break statement. :) this is the "shut up" patch. :) it makes the -q option consequent, so to say. additionally it adds an -l option which gathers all defined/found mailboxes and just outputs the list. don't ask what i need it for. ;)
2002-10-30 02:23:05 +00:00
{
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
char *arg;
if (!strcasecmp( "Sync", cfile->cmd )) {
arg = cfile->val;
do
if (!strcasecmp( "Push", arg ))
*cops |= XOP_PUSH;
else if (!strcasecmp( "Pull", arg ))
*cops |= XOP_PULL;
else if (!strcasecmp( "ReNew", arg ))
*cops |= OP_RENEW;
else if (!strcasecmp( "New", arg ))
*cops |= OP_NEW;
else if (!strcasecmp( "Delete", arg ))
*cops |= OP_DELETE;
else if (!strcasecmp( "Flags", arg ))
*cops |= OP_FLAGS;
else if (!strcasecmp( "PullReNew", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[S] |= OP_RENEW;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PullNew", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[S] |= OP_NEW;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PullDelete", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[S] |= OP_DELETE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PullFlags", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[S] |= OP_FLAGS;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PushReNew", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= OP_RENEW;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PushNew", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= OP_NEW;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PushDelete", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= OP_DELETE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "PushFlags", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= OP_FLAGS;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "All", arg ) || !strcasecmp( "Full", arg ))
*cops |= XOP_PULL|XOP_PUSH;
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
else if (strcasecmp( "None", arg ) && strcasecmp( "Noop", arg )) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: invalid Sync arg '%s'\n",
cfile->file, cfile->line, arg );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
}
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
while ((arg = get_arg( cfile, ARG_OPTIONAL, 0 )));
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= XOP_HAVE_TYPE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
} else if (!strcasecmp( "Expunge", cfile->cmd )) {
arg = cfile->val;
do
if (!strcasecmp( "Both", arg ))
*cops |= OP_EXPUNGE;
else if (!strcasecmp( "Master", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= OP_EXPUNGE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "Slave", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[S] |= OP_EXPUNGE;
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
else if (strcasecmp( "None", arg )) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: invalid Expunge arg '%s'\n",
cfile->file, cfile->line, arg );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
}
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
while ((arg = get_arg( cfile, ARG_OPTIONAL, 0 )));
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= XOP_HAVE_EXPUNGE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
} else if (!strcasecmp( "Create", cfile->cmd )) {
arg = cfile->val;
do
if (!strcasecmp( "Both", arg ))
*cops |= OP_CREATE;
else if (!strcasecmp( "Master", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= OP_CREATE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else if (!strcasecmp( "Slave", arg ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[S] |= OP_CREATE;
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
else if (strcasecmp( "None", arg )) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: invalid Create arg '%s'\n",
cfile->file, cfile->line, arg );
make more config file errors fatal we really shouldn't just synchronize despite config parsing errors.
2012-09-15 09:49:24 +00:00
cfile->err = 1;
}
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
while ((arg = get_arg( cfile, ARG_OPTIONAL, 0 )));
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->ops[M] |= XOP_HAVE_CREATE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
} else if (!strcasecmp( "SyncState", cfile->cmd ))
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
conf->sync_state = expand_strdup( cfile->val );
make it possible to specify CopyArrivalDate and MaxMessages globally sneaky change on the side: the wording of the man page is changed from "outside any section" to "before any section" to get global options. this is not entirely true ... the previously existing options behave as before, while the two newcomers actually affect subsequent channels.
2013-11-24 18:39:33 +00:00
else if (!strcasecmp( "CopyArrivalDate", cfile->cmd ))
conf->use_internal_date = parse_bool( cfile );
else if (!strcasecmp( "MaxMessages", cfile->cmd ))
conf->max_messages = parse_int( cfile );
add ExpireUnread option
2013-11-24 19:26:33 +00:00
else if (!strcasecmp( "ExpireUnread", cfile->cmd ))
conf->expire_unread = parse_bool( cfile );
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else
return 0;
return 1;
Bunch 'o patches from Oswald Buddenhagen: i implemented some cool stuff (tm). first, the long missing "create server-side missing mailboxes". -C now creates both local and remote boxes; -L and -R create only local/remote. second, i implemented a 1:1 remote:local folder mapping (-1) with an optional INBOX exception (inbox/-I). the remote folder is specified with the folder keyword (or -F switch) and takes precedence over the namespace setting. the local directory with the mailboxes can now be specified on the command line, too (-M). another patch: - made the -1 switch settable permanently (OneToOne). after all, you usually define your mailbox layout once forever. removed -A, as it is semantically -a modified by -1. - cleaned up message output a bit. still, the quiet variable should be used throughout the program. at best, create some generic output function, which obeys a global verbosity level variable. - optimized + cleaned up configuration parser slightly - minor cleanups add an (almost) unique id to every uploaded message and search for it right after. i thought about using the message-id, but a) it is not guaranteed to be unique in a mailbox (imagine you edit a mail and store the dupe in the same box) and b) some mails (e.g., postponed) don't even have one. a downside of the current implementation is, that this id-header remains in the mailbox, but given that it wastes only 27 bytes per mail and removing it would mean several roundtrips more, this seems acceptable. i changed the line-counting loop to use a mmapped file instead of reading it in chunks, as it makes things simpler and is probably even faster for big mails. the amount of goto statements in my code may be scary, but c is simply lacking a multi-level break statement. :) this is the "shut up" patch. :) it makes the -q option consequent, so to say. additionally it adds an -l option which gathers all defined/found mailboxes and just outputs the list. don't ask what i need it for. ;)
2002-10-30 02:23:05 +00:00
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
int
getcline( conffile_t *cfile )
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
{
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
int comment;
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
while (fgets( cfile->buf, cfile->bufl, cfile->fp )) {
cfile->line++;
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
cfile->rest = cfile->buf;
if (!(cfile->cmd = get_arg( cfile, ARG_OPTIONAL, &comment ))) {
if (comment)
continue;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 1;
}
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
if (!(cfile->val = get_arg( cfile, ARG_REQUIRED, 0 )))
continue;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 1;
}
return 0;
}
patch from Daniel Resare <noa@metamatrix.se>: 1 giving a path to a nonexistant rc-file with the -c argument dumps core The patch adds a check to ensure that the given rc-file is accessible 2 the error messages given from failed openssl calls are bogus The handles the error from SSL_connect () correctly. The bug is understndable since the error handling in openssl is quite obfuscated. Good news is that the documentation manapges has been greatly updated in the latest version (0.9.6). See in particular err(3), ERR_get_error(3) and SSL_get_error(3). Please note that possible SSL_ERROR_SSL type errors from SSL_read() and SSL_write() is not handled. This should also be fixed. 3 connecting using the STARTTLS command with an imap server that is configured only to accept the TLSv1 protocol gives an error because isync sends an SSLv2 Hello message for backwards compability. (This is the case with the uw-imap 2000 that ships with redhat-7.0) I've read RFC2595 several times to see if it says something about compability SSL2/SSL3 hello messages but can't find anything. IMHO the correct thing to do is change the default to not use SSL2/3 compability hello when using the STARTTLS command but use it if the imaps port is used. The patch implements this change 4 repeated calls to SSL_CTX_set_options overwrites the old settings (the values needs to be ORed together) fixed in the patch patch from me@mutt.org: \Recent messages were put in the cur/ directory instead of new/ give error message when the LOGIN command fails
2001-02-14 20:46:41 +00:00
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
/* XXX - this does not detect None conflicts ... */
int
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
merge_ops( int cops, int ops[] )
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
{
int aops;
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
aops = ops[M] | ops[S];
if (ops[M] & XOP_HAVE_TYPE) {
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (aops & OP_MASK_TYPE) {
if (aops & cops & OP_MASK_TYPE) {
cfl:
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "Conflicting Sync args specified.\n" );
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 1;
}
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[M] |= cops & OP_MASK_TYPE;
ops[S] |= cops & OP_MASK_TYPE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (cops & XOP_PULL) {
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
if (ops[S] & OP_MASK_TYPE)
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
goto cfl;
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[S] |= OP_MASK_TYPE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
if (cops & XOP_PUSH) {
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
if (ops[M] & OP_MASK_TYPE)
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
goto cfl;
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[M] |= OP_MASK_TYPE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
} else if (cops & (OP_MASK_TYPE|XOP_MASK_DIR)) {
if (!(cops & OP_MASK_TYPE))
cops |= OP_MASK_TYPE;
else if (!(cops & XOP_MASK_DIR))
cops |= XOP_PULL|XOP_PUSH;
if (cops & XOP_PULL)
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[S] |= cops & OP_MASK_TYPE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (cops & XOP_PUSH)
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[M] |= cops & OP_MASK_TYPE;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
added support for tilde (~) expansion in the `Mailbox' and `CertificateFile' configuration directives added `Maildir' configuration command to specify the default location of the user's mailboxes. If a relative path is used in a `Mailbox' command, this path is used as a prefix.
2001-01-16 19:45:08 +00:00
}
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
if (ops[M] & XOP_HAVE_EXPUNGE) {
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (aops & cops & OP_EXPUNGE) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "Conflicting Expunge args specified.\n" );
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 1;
}
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[M] |= cops & OP_EXPUNGE;
ops[S] |= cops & OP_EXPUNGE;
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
}
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
if (ops[M] & XOP_HAVE_CREATE) {
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (aops & cops & OP_CREATE) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "Conflicting Create args specified.\n" );
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 1;
}
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ops[M] |= cops & OP_CREATE;
ops[S] |= cops & OP_CREATE;
Bunch 'o patches from Oswald Buddenhagen: i implemented some cool stuff (tm). first, the long missing "create server-side missing mailboxes". -C now creates both local and remote boxes; -L and -R create only local/remote. second, i implemented a 1:1 remote:local folder mapping (-1) with an optional INBOX exception (inbox/-I). the remote folder is specified with the folder keyword (or -F switch) and takes precedence over the namespace setting. the local directory with the mailboxes can now be specified on the command line, too (-M). another patch: - made the -1 switch settable permanently (OneToOne). after all, you usually define your mailbox layout once forever. removed -A, as it is semantically -a modified by -1. - cleaned up message output a bit. still, the quiet variable should be used throughout the program. at best, create some generic output function, which obeys a global verbosity level variable. - optimized + cleaned up configuration parser slightly - minor cleanups add an (almost) unique id to every uploaded message and search for it right after. i thought about using the message-id, but a) it is not guaranteed to be unique in a mailbox (imagine you edit a mail and store the dupe in the same box) and b) some mails (e.g., postponed) don't even have one. a downside of the current implementation is, that this id-header remains in the mailbox, but given that it wastes only 27 bytes per mail and removing it would mean several roundtrips more, this seems acceptable. i changed the line-counting loop to use a mmapped file instead of reading it in chunks, as it makes things simpler and is probably even faster for big mails. the amount of goto statements in my code may be scary, but c is simply lacking a multi-level break statement. :) this is the "shut up" patch. :) it makes the -q option consequent, so to say. additionally it adds an -l option which gathers all defined/found mailboxes and just outputs the list. don't ask what i need it for. ;)
2002-10-30 02:23:05 +00:00
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 0;
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
}
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
int
load_config( const char *where, int pseudo )
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
{
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
conffile_t cfile;
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
store_conf_t *store, **storeapp = &stores;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
channel_conf_t *channel, **channelapp = &channels;
group_conf_t *group, **groupapp = &groups;
string_list_t *chanlist, **chanlistapp;
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
char *arg, *p;
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
int len, cops, gcops, max_size, ms, i;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
char path[_POSIX_PATH_MAX];
char buf[1024];
broke config code into config.c added support for uploading local messages with no UID to the IMAP server added Expunge configuration option added CopyDeletedTo configuration option
2001-01-11 10:13:47 +00:00
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
if (!where) {
nfsnprintf( path, sizeof(path), "%s/." EXE "rc", Home );
cfile.file = path;
} else
cfile.file = where;
if (!pseudo)
info( "Reading configuration file %s\n", cfile.file );
if (!(cfile.fp = fopen( cfile.file, "r" ))) {
unify error reporting - introduce sys_error() and use it instead of perror() and error(strerror()) in all expected error conditions - perror() is used only for "something's really wrong with the system" kind of errors - file names, etc. are quoted if they are not validated yet, so e.g. an empty string becomes immediately obvious - improve and unify language - add missing newlines
2011-04-10 13:32:25 +00:00
sys_error( "Cannot open config file '%s'", cfile.file );
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
return 1;
}
buf[sizeof(buf) - 1] = 0;
cfile.buf = buf;
cfile.bufl = sizeof(buf) - 1;
cfile.line = 0;
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 0;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
gcops = 0;
add ExpireUnread option
2013-11-24 19:26:33 +00:00
global_conf.expire_unread = -1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
reloop:
while (getcline( &cfile )) {
if (!cfile.cmd)
continue;
aggregate all (two ...) drivers in an array instead of naming them in each (one ...) location explicitly.
2006-03-20 18:36:49 +00:00
for (i = 0; i < N_DRIVERS; i++)
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
if (drivers[i]->parse_store( &cfile, &store )) {
aggregate all (two ...) drivers in an array instead of naming them in each (one ...) location explicitly.
2006-03-20 18:36:49 +00:00
if (store) {
if (!store->path)
store->path = "";
use INT_MAX instead of zero for "no size limit" this simplifies the actual conditions
2013-05-11 08:12:33 +00:00
if (!store->max_size)
store->max_size = INT_MAX;
aggregate all (two ...) drivers in an array instead of naming them in each (one ...) location explicitly.
2006-03-20 18:36:49 +00:00
*storeapp = store;
storeapp = &store->next;
*storeapp = 0;
}
goto reloop;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
aggregate all (two ...) drivers in an array instead of naming them in each (one ...) location explicitly.
2006-03-20 18:36:49 +00:00
if (!strcasecmp( "Channel", cfile.cmd ))
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
{
channel = nfcalloc( sizeof(*channel) );
channel->name = nfstrdup( cfile.val );
make it possible to specify CopyArrivalDate and MaxMessages globally sneaky change on the side: the wording of the man page is changed from "outside any section" to "before any section" to get global options. this is not entirely true ... the previously existing options behave as before, while the two newcomers actually affect subsequent channels.
2013-11-24 18:39:33 +00:00
channel->max_messages = global_conf.max_messages;
add ExpireUnread option
2013-11-24 19:26:33 +00:00
channel->expire_unread = global_conf.expire_unread;
make it possible to specify CopyArrivalDate and MaxMessages globally sneaky change on the side: the wording of the man page is changed from "outside any section" to "before any section" to get global options. this is not entirely true ... the previously existing options behave as before, while the two newcomers actually affect subsequent channels.
2013-11-24 18:39:33 +00:00
channel->use_internal_date = global_conf.use_internal_date;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
cops = 0;
max_size = -1;
while (getcline( &cfile ) && cfile.cmd) {
if (!strcasecmp( "MaxSize", cfile.cmd ))
max_size = parse_size( &cfile );
else if (!strcasecmp( "Pattern", cfile.cmd ) ||
!strcasecmp( "Patterns", cfile.cmd ))
{
arg = cfile.val;
do
add_string_list( &channel->patterns, arg );
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
while ((arg = get_arg( &cfile, ARG_OPTIONAL, 0 )));
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
else if (!strcasecmp( "Master", cfile.cmd )) {
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ms = M;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
goto linkst;
} else if (!strcasecmp( "Slave", cfile.cmd )) {
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
ms = S;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
linkst:
if (*cfile.val != ':' || !(p = strchr( cfile.val + 1, ':' ))) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: malformed mailbox spec\n",
cfile.file, cfile.line );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
continue;
}
*p = 0;
for (store = stores; store; store = store->next)
if (!strcmp( store->name, cfile.val + 1 )) {
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
channel->stores[ms] = store;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
goto stpcom;
}
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: unknown store '%s'\n",
cfile.file, cfile.line, cfile.val + 1 );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
continue;
stpcom:
if (*++p)
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
channel->boxes[ms] = nfstrdup( p );
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
} else if (!getopt_helper( &cfile, &cops, channel )) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: unknown keyword '%s'\n", cfile.file, cfile.line, cfile.cmd );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
}
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
if (!channel->stores[M]) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "channel '%s' refers to no master store\n", channel->name );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
} else if (!channel->stores[S]) {
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "channel '%s' refers to no slave store\n", channel->name );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
} else if (merge_ops( cops, channel->ops ))
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
else {
if (max_size >= 0)
- instead of having {m,s}foo, we have foo[2] now, so we can do everything with loops instead of symmetric function calls - added some const
2005-12-28 10:02:22 +00:00
channel->stores[M]->max_size = channel->stores[S]->max_size = max_size;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
*channelapp = channel;
channelapp = &channel->next;
}
}
else if (!strcasecmp( "Group", cfile.cmd ))
{
group = nfmalloc( sizeof(*group) );
group->name = nfstrdup( cfile.val );
*groupapp = group;
groupapp = &group->next;
*groupapp = 0;
chanlistapp = &group->channels;
*chanlistapp = 0;
make config parser a bit more careful about quotes the parsing is more shell-like now: - quoted and unquoted parts can be mixed in one argument - the hashmark can be meaningfully quoted
2012-09-15 09:24:57 +00:00
while ((arg = get_arg( &cfile, ARG_OPTIONAL, 0 ))) {
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
addone:
len = strlen( arg );
chanlist = nfmalloc( sizeof(*chanlist) + len );
memcpy( chanlist->string, arg, len + 1 );
*chanlistapp = chanlist;
chanlistapp = &chanlist->next;
*chanlistapp = 0;
}
while (getcline( &cfile )) {
if (!cfile.cmd)
goto reloop;
if (!strcasecmp( "Channel", cfile.cmd ) ||
!strcasecmp( "Channels", cfile.cmd ))
{
arg = cfile.val;
goto addone;
}
else
{
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: unknown keyword '%s'\n",
cfile.file, cfile.line, cfile.cmd );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
}
break;
}
add option to control amount of fsync()ing
2012-09-15 13:15:22 +00:00
else if (!strcasecmp( "FSync", cfile.cmd ))
{
reduce FSync option to a boolean there is no use for Thorough mode any more, so simplify the configuration.
2013-11-02 20:42:34 +00:00
UseFSync = parse_bool( &cfile );
add option to control amount of fsync()ing
2012-09-15 13:15:22 +00:00
}
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
else if (!getopt_helper( &cfile, &gcops, &global_conf ))
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
{
"fprintf( stderr," => "error(". new functions debugn() and infon() for messages with missing newline; warn() and error() act upon this.
2006-03-19 11:29:12 +00:00
error( "%s:%d: unknown section keyword '%s'\n",
cfile.file, cfile.line, cfile.cmd );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
cfile.err = 1;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
while (getcline( &cfile ))
if (!cfile.cmd)
goto reloop;
break;
}
}
fclose (cfile.fp);
replace global_* with a channel_conf_t instance this makes the (growing) list of getopt_helper()'s parameters manageable. the few wasted bytes are worth it.
2013-11-24 18:32:42 +00:00
cfile.err |= merge_ops( gcops, global_conf.ops );
if (!global_conf.sync_state)
global_conf.sync_state = expand_strdup( "~/." EXE "/" );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
if (!cfile.err && pseudo)
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
unlink( where );
store config error status in conffile_t object this makes passing it around more straight-forward
2012-09-15 09:46:42 +00:00
return cfile.err;
The Big Rewrite. too many change to list them all. as opposed to earlier threats, BerkDB was not entirely dropped; i suppose the isync 0.7 -> 0.8 change had a reason, so i added an alternative UID storage scheme. note that BDB 4.0 is not sufficient, as the db->open function changed in an incompatible way ... i updated the debian packaging except for a changelog entry. note that i removed the upgrade blurb, as upstream now has a smooth upgrade path down to at least isync 0.4.
2004-03-27 16:07:20 +00:00
}
Reference in New Issue Copy Permalink