lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d54809e268
isync/src/main.c

1092 lines
26 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>
make help screen print some more compile time options
2017-03-19 17:08:55 +00:00
* Copyright (C) 2002-2006,2010-2017 Oswald Buddenhagen <ossi@users.sf.net>
initial import
2000-12-20 21:41:21 +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/>.
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
*
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.
initial import
2000-12-20 21:41:21 +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 "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
initial import
2000-12-20 21:41:21 +00:00
#include <stdlib.h>
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
#include <stddef.h>
initial import
2000-12-20 21:41:21 +00:00
#include <unistd.h>
#include <string.h>
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
#include <fcntl.h>
#include <signal.h>
make use of strptime() portable it does not (officially) support the %z conversion, so re-implement that part by hand.
2013-11-09 13:35:07 +00:00
#include <time.h>
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
#include <sys/wait.h>
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
reshuffle sources a bit split header and move some code to more logical places.
2013-12-08 19:46:40 +00:00
int DFlags;
int UseFSync = 1;
introduce FieldDelimiter and InfoDelimiter options ... for windows fs compatibility. the maildir-specific InfoDelimiter inherits the global FieldDelimiter (which affects SyncState), based on the assumption that if the sync state is on a windows FS, the mailboxes certainly will be as well, while the inverse is not necessarily true (when running on unix, anyway). REFMAIL: <CA+m_8J1ynqAjHRJagvKt9sb31yz047Q7NH-ODRmHOKyfru8vtA@mail.gmail.com>
2014-10-25 15:30:57 +00:00
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__CYGWIN__)
char FieldDelimiter = ';';
#else
char FieldDelimiter = ':';
#endif
reshuffle sources a bit split header and move some code to more logical places.
2013-12-08 19:46:40 +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 Pid; /* for maildir and imap */
char Hostname[256]; /* for maildir */
const char *Home; /* for config */
initial import
2000-12-20 21:41:21 +00:00
soft-limit peak memory usage propagating many messages from a fast store (typically maildir or a local IMAP server) to a slow asynchronous store could cause gigabytes of data being buffered. avoid this by throttling fetches if the target context reports memory usage above a configurable limit. REFMAIL: 9737edb14457c71af4ed156c1be0ae59@mpcjanssen.nl
2015-02-15 17:13:05 +00:00
int BufferLimit = 10 * 1024 * 1024;
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
int chans_total, chans_done;
int boxes_total, boxes_done;
int new_total[2], new_done[2];
int flags_total[2], flags_done[2];
int trash_total[2], trash_done[2];
initial import
2000-12-20 21:41:21 +00:00
static void
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
version( void )
initial import
2000-12-20 21:41:21 +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
puts( PACKAGE " " VERSION );
exit( 0 );
initial import
2000-12-20 21:41:21 +00:00
}
static void
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
usage( int code )
initial import
2000-12-20 21:41:21 +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
fputs(
PACKAGE " " VERSION " - mailbox synchronizer\n"
accumulate status over multiple mailboxes, i.e., don't abort after first failure
2003-05-05 13:24:03 +00:00
"Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>\n"
make help screen print some more compile time options
2017-03-19 17:08:55 +00:00
"Copyright (C) 2002-2006,2008,2010-2017 Oswald Buddenhagen <ossi@users.sf.net>\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
"Copyright (C) 2004 Theodore Ts'o <tytso@mit.edu>\n"
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
"usage:\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
" " EXE " [flags] {{channel[:box,...]|group} ...|-a}\n"
" -a, --all operate on all defined channels\n"
" -l, --list list mailboxes instead of syncing them\n"
" -n, --new propagate new messages\n"
" -d, --delete propagate message deletions\n"
" -f, --flags propagate message flag changes\n"
" -N, --renew propagate previously not propagated new messages\n"
" -L, --pull propagate from master to slave\n"
" -H, --push propagate from slave to master\n"
" -C, --create create mailboxes if nonexistent\n"
" -X, --expunge expunge deleted messages\n"
" -c, --config CONFIG read an alternate config file (default: ~/." EXE "rc)\n"
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
" -D, --debug debugging modes (see manual)\n"
" -V, --verbose display what is happening\n"
" -q, --quiet don't display progress counters\n"
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
" -v, --version display version\n"
" -h, --help display this help message\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
"\nIf neither --pull nor --push are specified, both are active.\n"
"If neither --new, --delete, --flags nor --renew are specified, all are active.\n"
"Direction and operation can be concatenated like --pull-new, etc.\n"
"--create and --expunge can be suffixed with -master/-slave. Read the man page.\n"
"\nSupported mailbox formats are: IMAP4rev1, Maildir\n"
"\nCompile time options:\n"
avoid preprocessor warnings on missing features: #if => #ifdef
2011-03-27 10:06:41 +00:00
#ifdef HAVE_LIBSSL
make help screen print some more compile time options
2017-03-19 17:08:55 +00:00
" +HAVE_LIBSSL"
update Copyright printed by --help add compile time option list to --help output
2001-10-03 06:15:01 +00:00
#else
make help screen print some more compile time options
2017-03-19 17:08:55 +00:00
" -HAVE_LIBSSL"
#endif
#ifdef HAVE_LIBSASL
" +HAVE_LIBSASL"
#else
" -HAVE_LIBSASL"
#endif
#ifdef HAVE_LIBZ
" +HAVE_LIBZ"
#else
" -HAVE_LIBZ"
#endif
#ifdef USE_DB
" +USE_DB"
#else
" -USE_DB"
#endif
#ifdef HAVE_IPV6
" +HAVE_IPV6\n"
#else
" -HAVE_IPV6\n"
update Copyright printed by --help add compile time option list to --help output
2001-10-03 06:15:01 +00:00
#endif
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
, code ? stderr : stdout );
exit( code );
initial import
2000-12-20 21:41:21 +00:00
}
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
static void ATTR_PRINTFLIKE(1, 2)
debug( const char *msg, ... )
{
va_list va;
va_start( va, msg );
vdebug( DEBUG_MAIN, msg, va );
va_end( va );
}
#ifdef __linux__ for the crash handler. it compiles on other platforms, but the functionality is bound to linux' /proc structure.
2007-04-04 16:19:47 +00:00
#ifdef __linux__
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
static void
crashHandler( int n )
{
int dpid;
char pbuf[10], pabuf[20];
close( 0 );
open( "/dev/tty", O_RDWR );
dup2( 0, 1 );
dup2( 0, 2 );
"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( "*** " EXE " caught signal %d. Starting debugger ...\n", n );
#ifdef __linux__ for the crash handler. it compiles on other platforms, but the functionality is bound to linux' /proc structure.
2007-04-04 16:19:47 +00:00
switch ((dpid = fork())) {
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
case -1:
perror( "fork()" );
break;
case 0:
sprintf( pbuf, "%d", Pid );
sprintf( pabuf, "/proc/%d/exe", Pid );
execlp( "gdb", "gdb", pabuf, pbuf, (char *)0 );
perror( "execlp()" );
_exit( 1 );
default:
waitpid( dpid, 0, 0 );
break;
}
exit( 3 );
}
#ifdef __linux__ for the crash handler. it compiles on other platforms, but the functionality is bound to linux' /proc structure.
2007-04-04 16:19:47 +00:00
#endif
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
void
stats( void )
{
char buf[3][64];
char *cs;
int t, l, ll, cls;
static int cols = -1;
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
if (!(DFlags & PROGRESS))
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
return;
if (cols < 0 && (!(cs = getenv( "COLUMNS" )) || !(cols = atoi( cs ))))
cols = 80;
ll = sprintf( buf[2], "C: %d/%d B: %d/%d", chans_done, chans_total, boxes_done, boxes_total );
cls = (cols - ll - 10) / 2;
for (t = 0; t < 2; t++) {
l = sprintf( buf[t], "+%d/%d *%d/%d #%d/%d",
new_done[t], new_total[t],
flags_done[t], flags_total[t],
trash_done[t], trash_total[t] );
if (l > cls)
buf[t][cls - 1] = '~';
}
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
progress( "\r%s M: %.*s S: %.*s", buf[2], cls, buf[0], cls, buf[1] );
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26: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
static int
matches( const char *t, const char *p )
initial import
2000-12-20 21:41:21 +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
for (;;) {
if (!*p)
return !*t;
if (*p == '*') {
p++;
do {
if (matches( t, p ))
return 1;
} while (*t++);
return 0;
} else if (*p == '%') {
p++;
do {
add support for hierarchical mailboxes
2012-08-11 16:34:46 +00:00
if (*t == '/')
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;
if (matches( t, p ))
return 1;
} while (*t++);
return 0;
} else {
if (*p != *t)
return 0;
p++, t++;
}
}
initial import
2000-12-20 21:41:21 +00:00
}
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
static int
is_inbox( const char *name )
{
return starts_with( name, -1, "INBOX", 5 ) && (!name[5] || name[5] == '/');
}
static int
cmp_box_names( const void *a, const void *b )
{
const char *as = *(const char **)a;
const char *bs = *(const char **)b;
int ai = is_inbox( as );
int bi = is_inbox( bs );
int di = bi - ai;
if (di)
return di;
return strcmp( as, bs );
}
static char **
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
filter_boxes( string_list_t *boxes, const char *prefix, string_list_t *patterns )
initial import
2000-12-20 21:41:21 +00:00
{
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
string_list_t *cpat;
char **boxarr = 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
const char *ps;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
int not, fnot, pfxl, num = 0, rnum = 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
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
pfxl = prefix ? strlen( prefix ) : 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
for (; boxes; boxes = boxes->next) {
stop abusing memcmp() memcmp() is unfortunately not guaranteed to read forward byte-by-byte, which means that the clever use as a strncmp() without the pointless strlen()s is not permitted, and can actually misbehave with SSE-optimized string functions. so implement proper equals() and starts_with() functions. as a bonus, the calls are less cryptic.
2014-10-04 15:07:17 +00:00
if (!starts_with( boxes->string, -1, prefix, pfxl ))
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
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
fnot = 1;
for (cpat = patterns; cpat; cpat = cpat->next) {
ps = cpat->string;
if (*ps == '!') {
ps++;
not = 1;
} else
not = 0;
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
if (matches( boxes->string + pfxl, ps )) {
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
fnot = not;
break;
}
--host option didn't check for imaps: prefix
2001-06-22 23:30:41 +00:00
}
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
if (!fnot) {
if (num + 1 >= rnum)
boxarr = nfrealloc( boxarr, (rnum = (rnum + 10) * 2) * sizeof(*boxarr) );
boxarr[num++] = nfstrdup( boxes->string + pfxl );
boxarr[num] = 0;
}
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
}
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
qsort( boxarr, num, sizeof(*boxarr), cmp_box_names );
return boxarr;
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
}
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
static void
- 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_actions( channel_conf_t *chan, int ops[], int have, int mask, int def )
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 (ops[M] & have) {
chan->ops[M] &= ~mask;
chan->ops[M] |= ops[M] & mask;
chan->ops[S] &= ~mask;
chan->ops[S] |= ops[S] & mask;
} else if (!(chan->ops[M] & have)) {
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
if (global_conf.ops[M] & have) {
chan->ops[M] |= global_conf.ops[M] & mask;
chan->ops[S] |= global_conf.ops[S] & mask;
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 {
- 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
chan->ops[M] |= def;
chan->ops[S] |= def;
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
}
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
}
ignore anything that does not look remotely like a maildir when collecting mailboxes for OneToOne.
2004-01-09 20:43:36 +00:00
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
typedef struct box_ent {
struct box_ent *next;
char *name;
int present[2];
} box_ent_t;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
typedef struct chan_ent {
struct chan_ent *next;
channel_conf_t *conf;
box_ent_t *boxes;
char boxlist;
} chan_ent_t;
static chan_ent_t *
add_channel( chan_ent_t ***chanapp, channel_conf_t *chan, int ops[] )
{
chan_ent_t *ce = nfcalloc( sizeof(*ce) );
ce->conf = chan;
merge_actions( chan, ops, XOP_HAVE_TYPE, OP_MASK_TYPE, OP_MASK_TYPE );
merge_actions( chan, ops, XOP_HAVE_CREATE, OP_CREATE, 0 );
merge_actions( chan, ops, XOP_HAVE_REMOVE, OP_REMOVE, 0 );
merge_actions( chan, ops, XOP_HAVE_EXPUNGE, OP_EXPUNGE, 0 );
**chanapp = ce;
*chanapp = &ce->next;
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
chans_total++;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
return ce;
}
static chan_ent_t *
add_named_channel( chan_ent_t ***chanapp, char *channame, int ops[] )
{
channel_conf_t *chan;
chan_ent_t *ce;
box_ent_t *boxes = 0, **mboxapp = &boxes, *mbox;
char *boxp, *nboxp;
int boxl, boxlist = 0;
if ((boxp = strchr( channame, ':' )))
*boxp++ = 0;
for (chan = channels; chan; chan = chan->next)
if (!strcmp( chan->name, channame ))
goto gotchan;
error( "No channel or group named '%s' defined.\n", channame );
return 0;
gotchan:
if (boxp) {
if (!chan->patterns) {
error( "Cannot override mailbox in channel '%s' - no Patterns.\n", channame );
return 0;
}
boxlist = 1;
do {
nboxp = strpbrk( boxp, ",\n" );
if (nboxp) {
boxl = nboxp - boxp;
*nboxp++ = 0;
} else {
boxl = strlen( boxp );
}
mbox = nfmalloc( sizeof(*mbox) );
if (boxl)
mbox->name = nfstrndup( boxp, boxl );
else
mbox->name = nfstrndup( "INBOX", 5 );
mbox->present[M] = mbox->present[S] = BOX_POSSIBLE;
mbox->next = 0;
*mboxapp = mbox;
mboxapp = &mbox->next;
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
boxes_total++;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
boxp = nboxp;
} while (boxp);
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
} else {
if (!chan->patterns)
boxes_total++;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
}
ce = add_channel( chanapp, chan, ops );
ce->boxes = boxes;
ce->boxlist = boxlist;
return ce;
}
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
typedef struct {
int t[2];
channel_conf_t *chan;
driver_t *drv[2];
store_t *ctx[2];
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
chan_ent_t *chanptr;
box_ent_t *boxptr;
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
char *names[2];
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
int ret, all, list, state[2];
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
char done, skip, cben;
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
} main_vars_t;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
#define AUX &mvars->t[t]
#define MVARS(aux) \
int t = *(int *)aux; \
main_vars_t *mvars = (main_vars_t *)(((char *)(&((int *)aux)[-t])) - offsetof(main_vars_t, t));
#define E_START 0
#define E_OPEN 1
#define E_SYNC 2
static void sync_chans( main_vars_t *mvars, int ent );
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +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
main( int argc, char **argv )
{
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
main_vars_t mvars[1];
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
chan_ent_t *chans = 0, **chanapp = &chans;
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
group_conf_t *group;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
channel_conf_t *chan;
string_list_t *channame;
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
char *config = 0, *opt, *ochar;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
int oind, cops = 0, op, ops[2] = { 0, 0 }, pseudo = 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
make use of strptime() portable it does not (officially) support the %z conversion, so re-implement that part by hand.
2013-11-09 13:35:07 +00:00
tzset();
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
gethostname( Hostname, sizeof(Hostname) );
if ((ochar = strchr( Hostname, '.' )))
*ochar = 0;
Pid = getpid();
if (!(Home = getenv("HOME"))) {
fputs( "Fatal: $HOME not set\n", stderr );
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
arc4_init();
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
memset( mvars, 0, sizeof(*mvars) );
initialize mvars->t[1] to 1. helps enormously ... :}
2006-12-04 17:47:55 +00:00
mvars->t[1] = 1;
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
for (oind = 1, ochar = 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
if (!ochar || !*ochar) {
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (oind >= argc)
don't overlook 2nd and later single-letter options in last argument. reported by fedora -REF: <1197916586.13945.120.camel@localhost.localdomain>
2008-02-23 09:18:42 +00:00
break;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (argv[oind][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
break;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (argv[oind][1] == '-') {
opt = argv[oind++] + 2;
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 (!*opt)
break;
if (!strcmp( opt, "config" )) {
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (oind >= argc) {
"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( "--config requires an argument.\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;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
config = argv[oind++];
stop abusing memcmp() memcmp() is unfortunately not guaranteed to read forward byte-by-byte, which means that the clever use as a strncmp() without the pointless strlen()s is not permitted, and can actually misbehave with SSE-optimized string functions. so implement proper equals() and starts_with() functions. as a bonus, the calls are less cryptic.
2014-10-04 15:07:17 +00:00
} else if (starts_with( opt, -1, "config=", 7 ))
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
config = opt + 7;
else if (!strcmp( opt, "all" ))
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
mvars->all = 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 (!strcmp( opt, "list" ))
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
mvars->list = 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 (!strcmp( opt, "help" ))
usage( 0 );
else if (!strcmp( opt, "version" ))
version();
merge Quiet, Verbose & Debug into DFlags
2006-01-29 14:46:16 +00:00
else if (!strcmp( opt, "quiet" )) {
if (DFlags & QUIET)
DFlags |= VERYQUIET;
else
DFlags |= QUIET;
add extra verbose mode which dumps the message contents i needed that to debug the line ending issues. maybe it will find other uses as well ...
2010-02-06 09:40:36 +00:00
} else if (!strcmp( opt, "verbose" )) {
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
DFlags |= VERBOSE;
} else if (starts_with( opt, -1, "debug", 5 )) {
opt += 5;
if (!*opt)
op = VERBOSE | DEBUG_ALL;
else if (!strcmp( opt, "-crash" ))
op = DEBUG_CRASH;
else if (!strcmp( opt, "-maildir" ))
op = VERBOSE | DEBUG_MAILDIR;
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
else if (!strcmp( opt, "-main" ))
op = VERBOSE | DEBUG_MAIN;
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
else if (!strcmp( opt, "-net" ))
op = VERBOSE | DEBUG_NET;
else if (!strcmp( opt, "-net-all" ))
fix -DN not implying -Dn
2015-04-26 10:07:31 +00:00
op = VERBOSE | DEBUG_NET | DEBUG_NET_ALL;
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
else if (!strcmp( opt, "-sync" ))
op = VERBOSE | DEBUG_SYNC;
add extra verbose mode which dumps the message contents i needed that to debug the line ending issues. maybe it will find other uses as well ...
2010-02-06 09:40:36 +00:00
else
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
goto badopt;
DFlags |= op;
} else if (!strcmp( opt, "pull" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
cops |= XOP_PULL, 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 (!strcmp( opt, "push" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
cops |= XOP_PUSH, ops[M] |= XOP_HAVE_TYPE;
stop abusing memcmp() memcmp() is unfortunately not guaranteed to read forward byte-by-byte, which means that the clever use as a strncmp() without the pointless strlen()s is not permitted, and can actually misbehave with SSE-optimized string functions. so implement proper equals() and starts_with() functions. as a bonus, the calls are less cryptic.
2014-10-04 15:07:17 +00:00
else if (starts_with( opt, -1, "create", 6 )) {
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
opt += 6;
op = OP_CREATE|XOP_HAVE_CREATE;
lcop:
if (!*opt)
cops |= op;
else if (!strcmp( opt, "-master" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= op;
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 (!strcmp( opt, "-slave" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[S] |= op;
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
goto badopt;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= op & (XOP_HAVE_CREATE|XOP_HAVE_REMOVE|XOP_HAVE_EXPUNGE);
add support for propagating folder deletions
2014-12-29 01:08:48 +00:00
} else if (starts_with( opt, -1, "remove", 6 )) {
opt += 6;
op = OP_REMOVE|XOP_HAVE_REMOVE;
goto lcop;
stop abusing memcmp() memcmp() is unfortunately not guaranteed to read forward byte-by-byte, which means that the clever use as a strncmp() without the pointless strlen()s is not permitted, and can actually misbehave with SSE-optimized string functions. so implement proper equals() and starts_with() functions. as a bonus, the calls are less cryptic.
2014-10-04 15:07:17 +00:00
} else if (starts_with( opt, -1, "expunge", 7 )) {
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
opt += 7;
op = OP_EXPUNGE|XOP_HAVE_EXPUNGE;
goto lcop;
} else if (!strcmp( opt, "no-expunge" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
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 (!strcmp( opt, "no-create" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= XOP_HAVE_CREATE;
add support for propagating folder deletions
2014-12-29 01:08:48 +00:00
else if (!strcmp( opt, "no-remove" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= XOP_HAVE_REMOVE;
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 (!strcmp( opt, "full" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= XOP_HAVE_TYPE|XOP_PULL|XOP_PUSH;
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 (!strcmp( opt, "noop" ))
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= XOP_HAVE_TYPE;
stop abusing memcmp() memcmp() is unfortunately not guaranteed to read forward byte-by-byte, which means that the clever use as a strncmp() without the pointless strlen()s is not permitted, and can actually misbehave with SSE-optimized string functions. so implement proper equals() and starts_with() functions. as a bonus, the calls are less cryptic.
2014-10-04 15:07:17 +00:00
else if (starts_with( opt, -1, "pull", 4 )) {
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
op = XOP_PULL;
lcac:
opt += 4;
if (!*opt)
cops |= op;
else if (*opt == '-') {
opt++;
goto rlcac;
} else
goto badopt;
stop abusing memcmp() memcmp() is unfortunately not guaranteed to read forward byte-by-byte, which means that the clever use as a strncmp() without the pointless strlen()s is not permitted, and can actually misbehave with SSE-optimized string functions. so implement proper equals() and starts_with() functions. as a bonus, the calls are less cryptic.
2014-10-04 15:07:17 +00:00
} else if (starts_with( opt, -1, "push", 4 )) {
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
op = XOP_PUSH;
goto lcac;
} else {
op = 0;
rlcac:
if (!strcmp( opt, "new" ))
op |= OP_NEW;
else if (!strcmp( opt, "renew" ))
op |= OP_RENEW;
else if (!strcmp( opt, "delete" ))
op |= OP_DELETE;
else if (!strcmp( opt, "flags" ))
op |= OP_FLAGS;
else {
badopt:
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
error( "Unknown option '%s'\n", argv[oind - 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 1;
}
switch (op & XOP_MASK_DIR) {
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
case XOP_PULL: ops[S] |= op & OP_MASK_TYPE; break;
case XOP_PUSH: ops[M] |= op & OP_MASK_TYPE; break;
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
default: cops |= op; break;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
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
}
continue;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ochar = argv[oind++] + 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
if (!*ochar) {
"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( "Invalid option '-'\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;
}
}
switch (*ochar++) {
case 'a':
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
mvars->all = 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;
case 'l':
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
mvars->list = 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;
case 'c':
if (*ochar == 'T') {
ochar++;
pseudo = 1;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (oind >= argc) {
"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( "-c requires an argument.\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;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
config = argv[oind++];
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;
case 'C':
op = OP_CREATE|XOP_HAVE_CREATE;
cop:
if (*ochar == 'm')
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= op, ochar++;
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 (*ochar == 's')
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[S] |= op, ochar++;
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 (*ochar == '-')
ochar++;
else
cops |= op;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
ops[M] |= op & (XOP_HAVE_CREATE|XOP_HAVE_REMOVE|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
break;
add support for propagating folder deletions
2014-12-29 01:08:48 +00:00
case 'R':
op = OP_REMOVE|XOP_HAVE_REMOVE;
goto cop;
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
case 'X':
op = OP_EXPUNGE|XOP_HAVE_EXPUNGE;
goto cop;
case 'F':
cops |= XOP_PULL|XOP_PUSH;
add/fix comments and improve debug messages
2013-11-02 19:06:08 +00:00
/* fallthrough */
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
case '0':
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
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
break;
case 'n':
case 'd':
case 'f':
case 'N':
--ochar;
op = 0;
cac:
for (;; ochar++) {
if (*ochar == 'n')
op |= OP_NEW;
else if (*ochar == 'd')
op |= OP_DELETE;
else if (*ochar == 'f')
op |= OP_FLAGS;
else if (*ochar == 'N')
op |= OP_RENEW;
else
break;
}
if (op & OP_MASK_TYPE)
switch (op & XOP_MASK_DIR) {
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
case XOP_PULL: ops[S] |= op & OP_MASK_TYPE; break;
case XOP_PUSH: ops[M] |= op & OP_MASK_TYPE; break;
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
default: cops |= op; break;
}
else
cops |= op;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
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
break;
case 'L':
op = XOP_PULL;
goto cac;
case 'H':
op = XOP_PUSH;
goto cac;
case 'q':
merge Quiet, Verbose & Debug into DFlags
2006-01-29 14:46:16 +00:00
if (DFlags & QUIET)
DFlags |= VERYQUIET;
else
DFlags |= QUIET;
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;
case 'V':
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
DFlags |= VERBOSE;
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;
case 'D':
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
for (op = 0; *ochar; ochar++) {
switch (*ochar) {
case 'C':
op |= DEBUG_CRASH;
break;
case 'm':
op |= DEBUG_MAILDIR | VERBOSE;
break;
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
case 'M':
op |= DEBUG_MAIN | VERBOSE;
break;
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
case 'n':
op |= DEBUG_NET | VERBOSE;
break;
case 'N':
fix -DN not implying -Dn
2015-04-26 10:07:31 +00:00
op |= DEBUG_NET | DEBUG_NET_ALL | VERBOSE;
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
break;
case 's':
op |= DEBUG_SYNC | VERBOSE;
break;
default:
error( "Unknown -D flag '%c'\n", *ochar );
return 1;
}
}
if (!op)
op = DEBUG_ALL | VERBOSE;
DFlags |= op;
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;
undocumented flag -J to skip committing the new sync state.
2006-01-29 15:46:09 +00:00
case 'J':
DFlags |= KEEPJOURNAL;
break;
deal with concurrent maildir modifications during listing files may be renamed (due to new -> cur transition or flag changes), which may lead to two effects if ignored: - we see both the old and the new name, so we report a spurious duplicate UID - we see neither name, so we report a spurious deletion as countermeasure, record and compare directory modification times. upon mismatch, we just start over - as usual.
2012-08-25 13:29:16 +00:00
case 'Z':
DFlags |= ZERODELAY;
break;
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
case 'v':
version();
case 'h':
usage( 0 );
default:
"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( "Unknown option '-%c'\n", *(ochar - 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 1;
isync should continue to process additional mailboxes even if there is an error with a previous mailbox. added -a (--all) flag to synchronize all mailboxes defined in ~/.isyncrc
2001-06-18 17:49:08 +00:00
}
initial import
2000-12-20 21:41:21 +00:00
}
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
if (!(DFlags & (QUIET | DEBUG_ALL)) && isatty( 1 ))
DFlags |= PROGRESS;
#ifdef __linux__ for the crash handler. it compiles on other platforms, but the functionality is bound to linux' /proc structure.
2007-04-04 16:19:47 +00:00
#ifdef __linux__
revamp console output options - the old meaning of -V[V] was moved to -D{n|N}, as these are really debugging options. - don't print the info messages by default; this can be re-enabled with the -V switch, and is implied by most debug options (it was really kind of stupid that verbose/debug operation disabled these). - the sync algo/state debugging can be separately enabled with -Ds now.
2015-03-23 07:42:51 +00:00
if (DFlags & DEBUG_CRASH) {
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
signal( SIGSEGV, crashHandler );
signal( SIGBUS, crashHandler );
signal( SIGILL, crashHandler );
}
#ifdef __linux__ for the crash handler. it compiles on other platforms, but the functionality is bound to linux' /proc structure.
2007-04-04 16:19:47 +00:00
#endif
crash handler that launches gdb. activated when started with -D option. simplifies debugging crashes during the reg-tests.
2006-02-02 13:48:02 +00:00
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (merge_ops( cops, 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
return 1;
initial import
2000-12-20 21:41:21 +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 (load_config( config, pseudo ))
return 1;
initial import
2000-12-20 21:41:21 +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 (!channels) {
fputs( "No channels defined. Try 'man " EXE "'\n", stderr );
return 1;
}
initial import
2000-12-20 21:41:21 +00:00
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (mvars->all) {
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
for (chan = channels; chan; chan = chan->next) {
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
add_channel( &chanapp, chan, ops );
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
if (!chan->patterns)
boxes_total++;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
} else {
for (; argv[oind]; oind++) {
for (group = groups; group; group = group->next) {
if (!strcmp( group->name, argv[oind] )) {
for (channame = group->channels; channame; channame = channame->next)
if (!add_named_channel( &chanapp, channame->string, ops ))
mvars->ret = 1;
goto gotgrp;
}
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
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (!add_named_channel( &chanapp, argv[oind], ops ))
mvars->ret = 1;
gotgrp: ;
}
}
if (!chans) {
fputs( "No channel specified. Try '" EXE " -h'\n", stderr );
return 1;
}
mvars->chanptr = chans;
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
if (!mvars->list)
stats();
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
mvars->cben = 1;
sync_chans( mvars, E_START );
add simple mainloop implementation not used so far
2011-03-13 13:29:12 +00:00
main_loop();
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
if (!mvars->list)
flushn();
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
return mvars->ret;
}
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
#define ST_FRESH 0
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
#define ST_CONNECTED 1
#define ST_OPEN 2
#define ST_CANCELING 3
#define ST_CLOSED 4
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
static void
cancel_prep_done( void *aux )
{
MVARS(aux)
mvars->drv[t]->free_store( mvars->ctx[t] );
mvars->state[t] = ST_CLOSED;
sync_chans( mvars, E_OPEN );
}
static void
store_bad( void *aux )
{
MVARS(aux)
mvars->drv[t]->cancel_store( mvars->ctx[t] );
mvars->state[t] = ST_CLOSED;
mvars->ret = mvars->skip = 1;
sync_chans( mvars, E_OPEN );
}
static void store_connected( int sts, void *aux );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
static void store_listed( int sts, void *aux );
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
static int sync_listed_boxes( main_vars_t *mvars, box_ent_t *mbox );
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
static void done_sync_2_dyn( int sts, void *aux );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
static void done_sync( int sts, void *aux );
no/empty mailbox name means INBOX
2006-03-21 20:05:48 +00:00
#define nz(a,b) ((a)?(a):(b))
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
static void
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
sync_chans( main_vars_t *mvars, int ent )
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
{
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
box_ent_t *mbox, *nmbox, **mboxapp;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
char **boxes[2];
tag verbose output when channel links two verbose stores otherwise it's pure guesswork to assign the output to particular stores.
2013-12-08 15:37:20 +00:00
const char *labels[2];
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
int t, mb, sb, cmp;
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
if (!mvars->cben)
return;
switch (ent) {
case E_OPEN: goto opened;
case E_SYNC: goto syncone;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
do {
mvars->chan = mvars->chanptr->conf;
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
info( "Channel %s\n", mvars->chan->name );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
mvars->skip = mvars->cben = 0;
deal sensibly with permanent errors don't retry dead Stores for every Channel. this also introduces a state for transient errors (specifically, connect failures), but this is currently unused.
2015-01-03 23:39:06 +00:00
for (t = 0; t < 2; t++) {
prepend "get_" to getters in driver_t this makes it callbacks consistently start with a verb.
2017-03-19 12:46:03 +00:00
int st = mvars->chan->stores[t]->driver->get_fail_state( mvars->chan->stores[t] );
make skipping of failed stores more thorough in the case of imap stores, the failure is bound to the server config, not just the store config. that means that the storage of the failure state needs to be private to the driver, accessible only through a function.
2015-04-26 18:54:05 +00:00
if (st != FAIL_TEMP) {
info( "Skipping due to %sfailed %s store %s.\n",
(st == FAIL_WAIT) ? "temporarily " : "", str_ms[t], mvars->chan->stores[t]->name );
deal sensibly with permanent errors don't retry dead Stores for every Channel. this also introduces a state for transient errors (specifically, connect failures), but this is currently unused.
2015-01-03 23:39:06 +00:00
mvars->skip = 1;
}
}
if (mvars->skip)
goto next2;
mvars->state[M] = mvars->state[S] = ST_FRESH;
tag verbose output when channel links two verbose stores otherwise it's pure guesswork to assign the output to particular stores.
2013-12-08 15:37:20 +00:00
if (mvars->chan->stores[M]->driver->flags & mvars->chan->stores[S]->driver->flags & DRV_VERBOSE)
labels[M] = "M: ", labels[S] = "S: ";
else
labels[M] = labels[S] = "";
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
for (t = 0; t < 2; t++) {
mvars->drv[t] = mvars->chan->stores[t]->driver;
mvars->ctx[t] = mvars->drv[t]->alloc_store( mvars->chan->stores[t], labels[t] );
set_bad_callback( mvars->ctx[t], store_bad, AUX );
}
don't leave 2nd store in limbo if opening 1st store fails synchronously we can't leave the store FRESH, as otherwise the error handling code will assume it is still being opened and will return to the main loop. depending on the config this would cause an immediate termination or an indefinite wait.
2015-01-02 10:29:51 +00:00
for (t = 0; ; t++) {
split off open_box() from select_box() aka prepare_paths() reloaded. we'll need it in a moment.
2014-12-27 22:39:55 +00:00
info( "Opening %s store %s...\n", str_ms[t], mvars->chan->stores[t]->name );
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
mvars->drv[t]->connect_store( mvars->ctx[t], store_connected, AUX );
if (t || mvars->skip)
remove own_store() function from driver model the drivers which support it can abstract it inside open_store() just fine.
2013-12-08 14:49:03 +00:00
break;
move whole responsibility for recycling open stores/server connections to the drivers.
2006-03-20 19:38:20 +00:00
}
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
mvars->cben = 1;
opened:
if (mvars->skip)
goto next;
if (mvars->state[M] != ST_OPEN || mvars->state[S] != ST_OPEN)
return;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (!mvars->chanptr->boxlist && mvars->chan->patterns) {
mvars->chanptr->boxlist = 2;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
boxes[M] = filter_boxes( mvars->ctx[M]->boxes, mvars->chan->boxes[M], mvars->chan->patterns );
boxes[S] = filter_boxes( mvars->ctx[S]->boxes, mvars->chan->boxes[S], mvars->chan->patterns );
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
mboxapp = &mvars->chanptr->boxes;
fix crash when no mailboxes match Patterns filter_boxes() just returns a null pointer in this case. REFMAIL: 20150330121211.GA10315@venus.fritz.box
2015-03-30 12:27:23 +00:00
for (mb = sb = 0; ; ) {
char *mname = boxes[M] ? boxes[M][mb] : 0;
char *sname = boxes[S] ? boxes[S][sb] : 0;
if (!mname && !sname)
break;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
mbox = nfmalloc( sizeof(*mbox) );
fix crash when no mailboxes match Patterns filter_boxes() just returns a null pointer in this case. REFMAIL: 20150330121211.GA10315@venus.fritz.box
2015-03-30 12:27:23 +00:00
if (!(cmp = !mname - !sname) && !(cmp = cmp_box_names( &mname, &sname ))) {
mbox->name = mname;
free( sname );
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
mbox->present[M] = mbox->present[S] = BOX_PRESENT;
mb++;
sb++;
} else if (cmp < 0) {
fix crash when no mailboxes match Patterns filter_boxes() just returns a null pointer in this case. REFMAIL: 20150330121211.GA10315@venus.fritz.box
2015-03-30 12:27:23 +00:00
mbox->name = mname;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
mbox->present[M] = BOX_PRESENT;
don't claim that INBOX is absent even if it was not listed IMAP defines that INBOX is always present.
2015-03-26 16:28:49 +00:00
mbox->present[S] = (!mb && !strcmp( mbox->name, "INBOX" )) ? BOX_PRESENT : BOX_ABSENT;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
mb++;
} else {
fix crash when no mailboxes match Patterns filter_boxes() just returns a null pointer in this case. REFMAIL: 20150330121211.GA10315@venus.fritz.box
2015-03-30 12:27:23 +00:00
mbox->name = sname;
don't claim that INBOX is absent even if it was not listed IMAP defines that INBOX is always present.
2015-03-26 16:28:49 +00:00
mbox->present[M] = (!sb && !strcmp( mbox->name, "INBOX" )) ? BOX_PRESENT : BOX_ABSENT;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
mbox->present[S] = BOX_PRESENT;
sb++;
}
mbox->next = 0;
*mboxapp = mbox;
mboxapp = &mbox->next;
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
boxes_total++;
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
}
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
free( boxes[M] );
free( boxes[S] );
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
if (!mvars->list)
stats();
split box list preparation from "consumption".
2006-03-21 10:38:30 +00:00
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
mvars->boxptr = mvars->chanptr->boxes;
split box list preparation from "consumption".
2006-03-21 10:38:30 +00:00
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
if (mvars->list && chans_total > 1)
async merge: aggregate most variables of main() & sync_boxes() in main_vars_t resp. sync_vars_t. also some minor var renames, whitespace, comments.
2006-03-21 15:53:43 +00:00
printf( "%s:\n", mvars->chan->name );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
syncml:
mvars->done = mvars->cben = 0;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (mvars->chanptr->boxlist) {
while ((mbox = mvars->boxptr)) {
mvars->boxptr = mbox->next;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
if (sync_listed_boxes( mvars, mbox ))
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
goto syncw;
}
} else {
if (!mvars->list) {
supplement open_box() with box existence information from list_store() there is no point in trying to open a non-existing box before trying to create it.
2014-12-30 14:16:38 +00:00
int present[] = { BOX_POSSIBLE, BOX_POSSIBLE };
sync_boxes( mvars->ctx, mvars->chan->boxes, present, mvars->chan, done_sync, mvars );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
mvars->skip = 1;
syncw:
mvars->cben = 1;
if (!mvars->done)
return;
syncone:
if (!mvars->skip)
goto syncml;
} else
no/empty mailbox name means INBOX
2006-03-21 20:05:48 +00:00
printf( "%s <=> %s\n", nz( mvars->chan->boxes[M], "INBOX" ), nz( mvars->chan->boxes[S], "INBOX" ) );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +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
next:
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
mvars->cben = 0;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
for (t = 0; t < 2; t++)
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
if (mvars->state[t] == ST_FRESH) {
/* An unconnected store may be only cancelled. */
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
mvars->state[t] = ST_CLOSED;
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
mvars->drv[t]->cancel_store( mvars->ctx[t] );
} else if (mvars->state[t] == ST_CONNECTED || mvars->state[t] == ST_OPEN) {
mvars->state[t] = ST_CANCELING;
mvars->drv[t]->cancel_cmds( mvars->ctx[t], cancel_prep_done, AUX );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
}
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
mvars->cben = 1;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
if (mvars->state[M] != ST_CLOSED || mvars->state[S] != ST_CLOSED) {
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
mvars->skip = 1;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
return;
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
if (mvars->chanptr->boxlist == 2) {
for (nmbox = mvars->chanptr->boxes; (mbox = nmbox); ) {
nmbox = mbox->next;
free( mbox->name );
free( mbox );
}
mvars->chanptr->boxes = 0;
mvars->chanptr->boxlist = 0;
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
}
deal sensibly with permanent errors don't retry dead Stores for every Channel. this also introduces a state for transient errors (specifically, connect failures), but this is currently unused.
2015-01-03 23:39:06 +00:00
next2:
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
if (!mvars->list) {
chans_done++;
stats();
}
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
} while ((mvars->chanptr = mvars->chanptr->next));
move whole responsibility for recycling open stores/server connections to the drivers.
2006-03-20 19:38:20 +00:00
for (t = 0; t < N_DRIVERS; t++)
drivers[t]->cleanup();
initial import
2000-12-20 21:41:21 +00:00
}
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
replace DRV_STORE_BAD with a separate bad_callback() that way we don't have to piggy-back (possibly asynchronous) fatal errors to particular commands. internally, the drivers still use synchronous return values as well, so they don't try to access the invalidated store after calling back.
2012-07-15 10:55:04 +00:00
static void
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
store_connected( int sts, void *aux )
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
{
MVARS(aux)
add support for hierarchical mailboxes
2012-08-11 16:34:46 +00:00
string_list_t *cpat;
make flags in pattern debugging non-cumulative
2015-05-01 18:19:58 +00:00
int cflags;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
switch (sts) {
case DRV_CANCELED:
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
return;
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
case DRV_OK:
fix repeated listing of same Store with different flags multiple Channels can call driver_t::list_store() with different LIST_* flags. assuming the flags are actually taken into consideration, using a single boolean 'listed' flag to track whether the Store still needs to be listed obviously wouldn't cut it - if INBOX does not live right under Path and the Channels used entirely disjoint Patterns (say, * and INBOX*), the second Channel in a single run (probably a Group) would fail to match anything. to fix this, make store_t::listed more granular. this also requires moving its handling back into the drivers (thus reverting c66afdc0), because the actually performed queries and their possible implicit results are driver-specific. note that this slightly pessimizes some cases - e.g., an IMAP Store with Path "" will now list the entire namespace even if there is only one Channel with Pattern "INBOX*" (because a hypothetical Pattern "*" would also include INBOX*, and the queries are kept disjoint to avoid the need for de-duplication). this isn't expected to be a problem, as listing mailboxes is generally cheap.
2017-03-21 17:46:30 +00:00
if (!mvars->skip && !mvars->chanptr->boxlist && mvars->chan->patterns) {
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
for (cflags = 0, cpat = mvars->chan->patterns; cpat; cpat = cpat->next) {
const char *pat = cpat->string;
if (*pat != '!') {
char buf[8];
int bufl = snprintf( buf, sizeof(buf), "%s%s", nz( mvars->chan->boxes[t], "" ), pat );
int flags = 0;
/* Partial matches like "INB*" or even "*" are not considered,
* except implicity when the INBOX lives under Path. */
if (starts_with( buf, bufl, "INBOX", 5 )) {
char c = buf[5];
if (!c) {
/* User really wants the INBOX. */
don't let wildcards match INBOX, unless it lives under Path it's counter-intuitive to have '*' match the (always present) INBOX when the rest of the mailboxes lives in a different namespace.
2013-04-13 17:05:27 +00:00
flags |= LIST_INBOX;
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
} else if (c == '/') {
/* Flattened sub-folders of INBOX actually end up in Path. */
if (mvars->ctx[t]->conf->flat_delim)
flags |= LIST_PATH;
else
flags |= LIST_INBOX;
make it possible to specifiy Pattern INBOX* with no Path defined that pattern may very well expand to INBOXNOT, which would naturally live under Path, so we need to look into the Path. of course, this actually makes sense only if there *is* a Path, and complaining about it being absent is backwards.
2015-05-23 09:06:17 +00:00
} else if (c == '*' || c == '%') {
/* It can be both INBOX and Path, but don't require Path to be configured. */
flags |= LIST_INBOX | LIST_PATH_MAYBE;
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
} else {
make it possible to specifiy Pattern INBOX* with no Path defined that pattern may very well expand to INBOXNOT, which would naturally live under Path, so we need to look into the Path. of course, this actually makes sense only if there *is* a Path, and complaining about it being absent is backwards.
2015-05-23 09:06:17 +00:00
/* It's definitely not the INBOX. */
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
flags |= LIST_PATH;
}
don't let wildcards match INBOX, unless it lives under Path it's counter-intuitive to have '*' match the (always present) INBOX when the rest of the mailboxes lives in a different namespace.
2013-04-13 17:05:27 +00:00
} else {
flags |= LIST_PATH;
}
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
debug( "pattern '%s' (effective '%s'): %sPath, %sINBOX\n",
pat, buf, (flags & LIST_PATH) ? "" : "no ", (flags & LIST_INBOX) ? "" : "no ");
cflags |= flags;
try harder to list all necessary boxes the pattern "INB*" may or may not refer to something in the INBOX. even just "*" may. so list both the INBOX and the Path in case of uncertainty.
2012-09-16 10:34:07 +00:00
}
}
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
mvars->state[t] = ST_CONNECTED;
mvars->drv[t]->list_store( mvars->ctx[t], cflags, store_listed, AUX );
return;
add support for hierarchical mailboxes
2012-08-11 16:34:46 +00:00
}
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
mvars->state[t] = ST_OPEN;
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
break;
default:
mvars->ret = mvars->skip = 1;
mvars->state[t] = ST_OPEN;
break;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
}
make server connection a cancellable operation this entails splitting drv->open_store() into alloc_store() and connect_store().
2015-05-24 09:37:15 +00:00
sync_chans( mvars, E_OPEN );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
}
static void
store_listed( int sts, void *aux )
{
MVARS(aux)
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
string_list_t **box, *bx;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
switch (sts) {
replace DRV_STORE_BAD with a separate bad_callback() that way we don't have to piggy-back (possibly asynchronous) fatal errors to particular commands. internally, the drivers still use synchronous return values as well, so they don't try to access the invalidated store after calling back.
2012-07-15 10:55:04 +00:00
case DRV_CANCELED:
return;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
case DRV_OK:
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
if (DFlags & DEBUG_MAIN) {
debug( "got mailbox list from %s:\n", str_ms[t] );
for (bx = mvars->ctx[t]->boxes; bx; bx = bx->next)
debug( " %s\n", bx->string );
}
introduce ability to flatten the hierarchy of Stores
2012-08-18 11:58:14 +00:00
if (mvars->ctx[t]->conf->flat_delim) {
support multi-character path separators this applies to both the IMAP PathDelimiter (which is needed by Lotus Domino), as well as the Flatten-ed separators.
2013-08-03 13:10:57 +00:00
for (box = &mvars->ctx[t]->boxes; *box; box = &(*box)->next) {
string_list_t *nbox;
if (map_name( (*box)->string, (char **)&nbox, offsetof(string_list_t, string), mvars->ctx[t]->conf->flat_delim, "/" ) < 0) {
error( "Error: flattened mailbox name '%s' contains canonical hierarchy delimiter\n", (*box)->string );
introduce ability to flatten the hierarchy of Stores
2012-08-18 11:58:14 +00:00
mvars->ret = mvars->skip = 1;
support multi-character path separators this applies to both the IMAP PathDelimiter (which is needed by Lotus Domino), as well as the Flatten-ed separators.
2013-08-03 13:10:57 +00:00
} else {
nbox->next = (*box)->next;
free( *box );
*box = nbox;
introduce ability to flatten the hierarchy of Stores
2012-08-18 11:58:14 +00:00
}
}
}
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
if (mvars->ctx[t]->conf->map_inbox) {
debug( "adding mapped inbox to %s: %s\n", str_ms[t], mvars->ctx[t]->conf->map_inbox );
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
add_string_list( &mvars->ctx[t]->boxes, mvars->ctx[t]->conf->map_inbox );
add debugging for main() so far, that's mostly mailbox listing
2015-03-26 17:09:25 +00:00
}
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
break;
default:
mvars->ret = mvars->skip = 1;
break;
}
replace DRV_STORE_BAD with a separate bad_callback() that way we don't have to piggy-back (possibly asynchronous) fatal errors to particular commands. internally, the drivers still use synchronous return values as well, so they don't try to access the invalidated store after calling back.
2012-07-15 10:55:04 +00:00
mvars->state[t] = ST_OPEN;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
sync_chans( mvars, E_OPEN );
}
factor out sync_listed_boxes()
2013-12-07 16:24:08 +00:00
static int
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
sync_listed_boxes( main_vars_t *mvars, box_ent_t *mbox )
factor out sync_listed_boxes()
2013-12-07 16:24:08 +00:00
{
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
if (mvars->chan->boxes[M] || mvars->chan->boxes[S]) {
const char *mpfx = nz( mvars->chan->boxes[M], "" );
const char *spfx = nz( mvars->chan->boxes[S], "" );
if (!mvars->list) {
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
nfasprintf( &mvars->names[M], "%s%s", mpfx, mbox->name );
nfasprintf( &mvars->names[S], "%s%s", spfx, mbox->name );
sync_boxes( mvars->ctx, (const char **)mvars->names, mbox->present, mvars->chan, done_sync_2_dyn, mvars );
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
return 1;
}
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
printf( "%s%s <=> %s%s\n", mpfx, mbox->name, spfx, mbox->name );
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
} else {
if (!mvars->list) {
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
mvars->names[M] = mvars->names[S] = mbox->name;
pre-calculate channel and box lists (as far as possible) ... instead of determining them on the fly, because - it enables early display of totals (to be used soon) - it enables re-use of the data (to be used at some point) - the code is less cryptic note that we leak the data created in main(), consistently with other configuration-related data.
2015-03-28 16:51:27 +00:00
sync_boxes( mvars->ctx, (const char **)mvars->names, mbox->present, mvars->chan, done_sync, mvars );
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
return 1;
}
rework Pattern application instead of creating three lists of mailboxes (common, master, slave) and deriving the mailbox presence from the list being processed, create a single joined list which contains the presence information. additionally, the list is sorted alphabetically (with INBOX first), which is neater.
2015-03-26 16:27:41 +00:00
puts( mbox->name );
factor out sync_listed_boxes()
2013-12-07 16:24:08 +00:00
}
return 0;
}
allow prefixes to Patterns this makes it possible to "rename" a "namespace" while syncing.
2013-12-08 08:49:39 +00:00
static void
done_sync_2_dyn( int sts, void *aux )
{
main_vars_t *mvars = (main_vars_t *)aux;
free( mvars->names[M] );
free( mvars->names[S] );
done_sync( sts, aux );
}
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
static void
done_sync( int sts, void *aux )
{
main_vars_t *mvars = (main_vars_t *)aux;
mvars->done = 1;
make progress counters global which means they are now cumulative, and include channels and boxes.
2015-03-28 16:26:08 +00:00
boxes_done++;
stats();
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
if (sts) {
mvars->ret = 1;
if (sts & (SYNC_BAD(M) | SYNC_BAD(S))) {
if (sts & SYNC_BAD(M))
mvars->state[M] = ST_CLOSED;
if (sts & SYNC_BAD(S))
mvars->state[S] = ST_CLOSED;
fix error handling of invalid SyncState * when we find that the store is incompatible with in-store sync state, we want to fail the whole channel. however, we must not claim that the store died, otherwise it won't be disposed of properly.
2012-08-18 10:48:08 +00:00
mvars->skip = 1;
make the driver model, sync_chans() and sync_boxes() fully async. async drivers to follow ...
2006-03-21 20:03:21 +00:00
}
}
sync_chans( mvars, E_SYNC );
}
Reference in New Issue Copy Permalink