|
|
|
|
/*
|
|
|
|
|
* mbsync - mailbox synchronizer
|
|
|
|
|
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
|
|
|
|
* Copyright (C) 2002-2006,2011 Oswald Buddenhagen <ossi@users.sf.net>
|
|
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*
|
|
|
|
|
* As a special exception, mbsync may be linked with the OpenSSL library,
|
|
|
|
|
* despite that library's more restrictive license.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
|
|
#include "sync.h"
|
|
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
#include <pwd.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
static store_conf_t *stores;
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
get_arg( conffile_t *cfile, int required, int *comment )
|
|
|
|
|
{
|
|
|
|
|
char *ret, *p, *t;
|
|
|
|
|
int escaped, quoted;
|
|
|
|
|
char c;
|
|
|
|
|
|
|
|
|
|
p = cfile->rest;
|
|
|
|
|
assert( p );
|
|
|
|
|
while ((c = *p) && isspace( (uchar)c ))
|
|
|
|
|
p++;
|
|
|
|
|
if (!c || c == '#') {
|
|
|
|
|
if (comment)
|
|
|
|
|
*comment = (c == '#');
|
|
|
|
|
if (required) {
|
|
|
|
|
error( "%s:%d: parameter missing\n", cfile->file, cfile->line );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
}
|
|
|
|
|
ret = NULL;
|
|
|
|
|
} else {
|
|
|
|
|
for (escaped = 0, quoted = 0, ret = t = p; c; c = *p) {
|
|
|
|
|
p++;
|
|
|
|
|
if (escaped && c >= 32) {
|
|
|
|
|
escaped = 0;
|
|
|
|
|
*t++ = c;
|
|
|
|
|
} else if (c == '\\')
|
|
|
|
|
escaped = 1;
|
|
|
|
|
else if (c == '"')
|
|
|
|
|
quoted ^= 1;
|
|
|
|
|
else if (!quoted && isspace( (uchar)c ))
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
*t++ = c;
|
|
|
|
|
}
|
|
|
|
|
*t = 0;
|
|
|
|
|
if (escaped) {
|
|
|
|
|
error( "%s:%d: unterminated escape sequence\n", cfile->file, cfile->line );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
ret = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (quoted) {
|
|
|
|
|
error( "%s:%d: missing closing quote\n", cfile->file, cfile->line );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
ret = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
cfile->rest = p;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char
|
|
|
|
|
parse_bool( conffile_t *cfile )
|
|
|
|
|
{
|
|
|
|
|
if (!strcasecmp( cfile->val, "yes" ) ||
|
|
|
|
|
!strcasecmp( cfile->val, "true" ) ||
|
|
|
|
|
!strcasecmp( cfile->val, "on" ) ||
|
|
|
|
|
!strcmp( cfile->val, "1" ))
|
|
|
|
|
return 1;
|
|
|
|
|
if (strcasecmp( cfile->val, "no" ) &&
|
|
|
|
|
strcasecmp( cfile->val, "false" ) &&
|
|
|
|
|
strcasecmp( cfile->val, "off" ) &&
|
|
|
|
|
strcmp( cfile->val, "0" )) {
|
|
|
|
|
error( "%s:%d: invalid boolean value '%s'\n",
|
|
|
|
|
cfile->file, cfile->line, cfile->val );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
parse_int( conffile_t *cfile )
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = strtol( cfile->val, &p, 10 );
|
|
|
|
|
if (*p) {
|
|
|
|
|
error( "%s:%d: invalid integer value '%s'\n",
|
|
|
|
|
cfile->file, cfile->line, cfile->val );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint
|
|
|
|
|
parse_size( conffile_t *cfile )
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
uint ret;
|
|
|
|
|
|
|
|
|
|
ret = strtoul( cfile->val, &p, 10 );
|
|
|
|
|
if (*p == 'k' || *p == 'K')
|
|
|
|
|
ret *= 1024, p++;
|
|
|
|
|
else if (*p == 'm' || *p == 'M')
|
|
|
|
|
ret *= 1024 * 1024, p++;
|
|
|
|
|
if (*p == 'b' || *p == 'B')
|
|
|
|
|
p++;
|
|
|
|
|
if (*p) {
|
|
|
|
|
fprintf (stderr, "%s:%d: invalid size '%s'\n",
|
|
|
|
|
cfile->file, cfile->line, cfile->val);
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct {
|
|
|
|
|
int op;
|
|
|
|
|
const char *name;
|
|
|
|
|
} boxOps[] = {
|
|
|
|
|
{ OP_EXPUNGE, "Expunge" },
|
|
|
|
|
{ OP_CREATE, "Create" },
|
|
|
|
|
{ OP_REMOVE, "Remove" },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
getopt_helper( conffile_t *cfile, int *cops, channel_conf_t *conf )
|
Bunch 'o patches from Oswald Buddenhagen:
i implemented some cool stuff (tm).
first, the long missing "create server-side missing mailboxes". -C now
creates both local and remote boxes; -L and -R create only local/remote.
second, i implemented a 1:1 remote:local folder mapping (-1) with an
optional INBOX exception (inbox/-I). the remote folder is specified with
the folder keyword (or -F switch) and takes precedence over the
namespace setting. the local directory with the mailboxes can now be
specified on the command line, too (-M).
another patch:
- made the -1 switch settable permanently (OneToOne). after all, you
usually define your mailbox layout once forever. removed -A, as it is
semantically -a modified by -1.
- cleaned up message output a bit. still, the quiet variable should be
used throughout the program. at best, create some generic output
function, which obeys a global verbosity level variable.
- optimized + cleaned up configuration parser slightly
- minor cleanups
add an (almost) unique id to every uploaded message and search for it
right after. i thought about using the message-id, but a) it is not
guaranteed to be unique in a mailbox (imagine you edit a mail and store
the dupe in the same box) and b) some mails (e.g., postponed) don't even
have one. a downside of the current implementation is, that this
id-header remains in the mailbox, but given that it wastes only 27 bytes
per mail and removing it would mean several roundtrips more, this seems
acceptable.
i changed the line-counting loop to use a mmapped file instead of
reading it in chunks, as it makes things simpler and is probably even
faster for big mails.
the amount of goto statements in my code may be scary, but c is simply
lacking a multi-level break statement. :)
this is the "shut up" patch. :) it makes the -q option consequent, so to
say.
additionally it adds an -l option which gathers all defined/found
mailboxes and just outputs the list. don't ask what i need it for. ;)
22 years ago
|
|
|
{
|
|
|
|
|
char *arg;
|
|
|
|
|
uint i;
|
|
|
|
|
|
|
|
|
|
if (!strcasecmp( "Sync", cfile->cmd )) {
|
|
|
|
|
arg = cfile->val;
|
|
|
|
|
do
|
|
|
|
|
if (!strcasecmp( "Push", arg ))
|
|
|
|
|
*cops |= XOP_PUSH;
|
|
|
|
|
else if (!strcasecmp( "Pull", arg ))
|
|
|
|
|
*cops |= XOP_PULL;
|
|
|
|
|
else if (!strcasecmp( "ReNew", arg ))
|
|
|
|
|
*cops |= OP_RENEW;
|
|
|
|
|
else if (!strcasecmp( "New", arg ))
|
|
|
|
|
*cops |= OP_NEW;
|
|
|
|
|
else if (!strcasecmp( "Delete", arg ))
|
|
|
|
|
*cops |= OP_DELETE;
|
|
|
|
|
else if (!strcasecmp( "Flags", arg ))
|
|
|
|
|
*cops |= OP_FLAGS;
|
|
|
|
|
else if (!strcasecmp( "PullReNew", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[N] |= OP_RENEW;
|
|
|
|
|
else if (!strcasecmp( "PullNew", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[N] |= OP_NEW;
|
|
|
|
|
else if (!strcasecmp( "PullDelete", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[N] |= OP_DELETE;
|
|
|
|
|
else if (!strcasecmp( "PullFlags", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[N] |= OP_FLAGS;
|
|
|
|
|
else if (!strcasecmp( "PushReNew", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[F] |= OP_RENEW;
|
|
|
|
|
else if (!strcasecmp( "PushNew", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[F] |= OP_NEW;
|
|
|
|
|
else if (!strcasecmp( "PushDelete", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[F] |= OP_DELETE;
|
|
|
|
|
else if (!strcasecmp( "PushFlags", arg ))
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[F] |= OP_FLAGS;
|
|
|
|
|
else if (!strcasecmp( "All", arg ) || !strcasecmp( "Full", arg ))
|
|
|
|
|
*cops |= XOP_PULL|XOP_PUSH;
|
|
|
|
|
else if (strcasecmp( "None", arg ) && strcasecmp( "Noop", arg )) {
|
|
|
|
|
error( "%s:%d: invalid Sync arg '%s'\n",
|
|
|
|
|
cfile->file, cfile->line, arg );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
}
|
|
|
|
|
while ((arg = get_arg( cfile, ARG_OPTIONAL, NULL )));
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[F] |= XOP_HAVE_TYPE;
|
|
|
|
|
} else if (!strcasecmp( "SyncState", cfile->cmd ))
|
|
|
|
|
conf->sync_state = expand_strdup( cfile->val );
|
|
|
|
|
else if (!strcasecmp( "CopyArrivalDate", cfile->cmd ))
|
|
|
|
|
conf->use_internal_date = parse_bool( cfile );
|
|
|
|
|
else if (!strcasecmp( "MaxMessages", cfile->cmd ))
|
|
|
|
|
conf->max_messages = parse_int( cfile );
|
|
|
|
|
else if (!strcasecmp( "ExpireUnread", cfile->cmd ))
|
|
|
|
|
conf->expire_unread = parse_bool( cfile );
|
|
|
|
|
else {
|
|
|
|
|
for (i = 0; i < as(boxOps); i++) {
|
|
|
|
|
if (!strcasecmp( boxOps[i].name, cfile->cmd )) {
|
|
|
|
|
int op = boxOps[i].op;
|
|
|
|
|
arg = cfile->val;
|
|
|
|
|
do {
|
|
|
|
|
if (!strcasecmp( "Both", arg )) {
|
|
|
|
|
*cops |= op;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
} else if (!strcasecmp( "Far", arg )) {
|
|
|
|
|
conf->ops[F] |= op;
|
|
|
|
|
} else if (!strcasecmp( "Master", arg )) { // Pre-1.4 legacy
|
|
|
|
|
conf->ops[F] |= op;
|
|
|
|
|
cfile->ms_warn = 1;
|
|
|
|
|
} else if (!strcasecmp( "Near", arg )) {
|
|
|
|
|
conf->ops[N] |= op;
|
|
|
|
|
} else if (!strcasecmp( "Slave", arg )) { // Pre-1.4 legacy
|
|
|
|
|
conf->ops[N] |= op;
|
|
|
|
|
cfile->ms_warn = 1;
|
|
|
|
|
} else if (strcasecmp( "None", arg )) {
|
|
|
|
|
error( "%s:%d: invalid %s arg '%s'\n",
|
|
|
|
|
cfile->file, cfile->line, boxOps[i].name, arg );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
}
|
|
|
|
|
} while ((arg = get_arg( cfile, ARG_OPTIONAL, NULL )));
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
conf->ops[F] |= op * (XOP_HAVE_EXPUNGE / OP_EXPUNGE);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
Bunch 'o patches from Oswald Buddenhagen:
i implemented some cool stuff (tm).
first, the long missing "create server-side missing mailboxes". -C now
creates both local and remote boxes; -L and -R create only local/remote.
second, i implemented a 1:1 remote:local folder mapping (-1) with an
optional INBOX exception (inbox/-I). the remote folder is specified with
the folder keyword (or -F switch) and takes precedence over the
namespace setting. the local directory with the mailboxes can now be
specified on the command line, too (-M).
another patch:
- made the -1 switch settable permanently (OneToOne). after all, you
usually define your mailbox layout once forever. removed -A, as it is
semantically -a modified by -1.
- cleaned up message output a bit. still, the quiet variable should be
used throughout the program. at best, create some generic output
function, which obeys a global verbosity level variable.
- optimized + cleaned up configuration parser slightly
- minor cleanups
add an (almost) unique id to every uploaded message and search for it
right after. i thought about using the message-id, but a) it is not
guaranteed to be unique in a mailbox (imagine you edit a mail and store
the dupe in the same box) and b) some mails (e.g., postponed) don't even
have one. a downside of the current implementation is, that this
id-header remains in the mailbox, but given that it wastes only 27 bytes
per mail and removing it would mean several roundtrips more, this seems
acceptable.
i changed the line-counting loop to use a mmapped file instead of
reading it in chunks, as it makes things simpler and is probably even
faster for big mails.
the amount of goto statements in my code may be scary, but c is simply
lacking a multi-level break statement. :)
this is the "shut up" patch. :) it makes the -q option consequent, so to
say.
additionally it adds an -l option which gathers all defined/found
mailboxes and just outputs the list. don't ask what i need it for. ;)
22 years ago
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
getcline( conffile_t *cfile )
|
|
|
|
|
{
|
|
|
|
|
char *arg;
|
|
|
|
|
int comment;
|
|
|
|
|
|
|
|
|
|
if (cfile->rest && (arg = get_arg( cfile, ARG_OPTIONAL, NULL ))) {
|
|
|
|
|
error( "%s:%d: excess token '%s'\n", cfile->file, cfile->line, arg );
|
|
|
|
|
cfile->err = 1;
|
|
|
|
|
}
|
|
|
|
|
while (fgets( cfile->buf, cfile->bufl, cfile->fp )) {
|
|
|
|
|
cfile->line++;
|
|
|
|
|
cfile->rest = cfile->buf;
|
|
|
|
|
if (!(cfile->cmd = get_arg( cfile, ARG_OPTIONAL, &comment ))) {
|
|
|
|
|
if (comment)
|
|
|
|
|
continue;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (!(cfile->val = get_arg( cfile, ARG_REQUIRED, NULL )))
|
|
|
|
|
continue;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* XXX - this does not detect None conflicts ... */
|
|
|
|
|
int
|
|
|
|
|
merge_ops( int cops, int ops[] )
|
|
|
|
|
{
|
|
|
|
|
int aops, op;
|
|
|
|
|
uint i;
|
|
|
|
|
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
aops = ops[F] | ops[N];
|
|
|
|
|
if (ops[F] & XOP_HAVE_TYPE) {
|
|
|
|
|
if (aops & OP_MASK_TYPE) {
|
|
|
|
|
if (aops & cops & OP_MASK_TYPE) {
|
|
|
|
|
cfl:
|
|
|
|
|
error( "Conflicting Sync args specified.\n" );
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
ops[F] |= cops & OP_MASK_TYPE;
|
|
|
|
|
ops[N] |= cops & OP_MASK_TYPE;
|
|
|
|
|
if (cops & XOP_PULL) {
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
if (ops[N] & OP_MASK_TYPE)
|
|
|
|
|
goto cfl;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
ops[N] |= OP_MASK_TYPE;
|
|
|
|
|
}
|
|
|
|
|
if (cops & XOP_PUSH) {
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
if (ops[F] & OP_MASK_TYPE)
|
|
|
|
|
goto cfl;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
ops[F] |= OP_MASK_TYPE;
|
|
|
|
|
}
|
|
|
|
|
} else if (cops & (OP_MASK_TYPE|XOP_MASK_DIR)) {
|
|
|
|
|
if (!(cops & OP_MASK_TYPE))
|
|
|
|
|
cops |= OP_MASK_TYPE;
|
|
|
|
|
else if (!(cops & XOP_MASK_DIR))
|
|
|
|
|
cops |= XOP_PULL|XOP_PUSH;
|
|
|
|
|
if (cops & XOP_PULL)
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
ops[N] |= cops & OP_MASK_TYPE;
|
|
|
|
|
if (cops & XOP_PUSH)
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
ops[F] |= cops & OP_MASK_TYPE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < as(boxOps); i++) {
|
|
|
|
|
op = boxOps[i].op;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
if (ops[F] & (op * (XOP_HAVE_EXPUNGE / OP_EXPUNGE))) {
|
|
|
|
|
if (aops & cops & op) {
|
|
|
|
|
error( "Conflicting %s args specified.\n", boxOps[i].name );
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
ops[F] |= cops & op;
|
|
|
|
|
ops[N] |= cops & op;
|
|
|
|
|
}
|
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. ;)
22 years ago
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
load_config( const char *where )
|
|
|
|
|
{
|
|
|
|
|
conffile_t cfile;
|
|
|
|
|
store_conf_t *store, **storeapp = &stores;
|
|
|
|
|
channel_conf_t *channel, **channelapp = &channels;
|
|
|
|
|
group_conf_t *group, **groupapp = &groups;
|
|
|
|
|
string_list_t *chanlist, **chanlistapp;
|
|
|
|
|
char *arg, *p;
|
|
|
|
|
uint len, max_size;
|
|
|
|
|
int cops, gcops, glob_ok, fn, i;
|
|
|
|
|
char path[_POSIX_PATH_MAX];
|
|
|
|
|
char buf[1024];
|
|
|
|
|
|
|
|
|
|
if (!where) {
|
|
|
|
|
nfsnprintf( path, sizeof(path), "%s/." EXE "rc", Home );
|
|
|
|
|
cfile.file = path;
|
|
|
|
|
} else
|
|
|
|
|
cfile.file = where;
|
|
|
|
|
|
|
|
|
|
info( "Reading configuration file %s\n", cfile.file );
|
|
|
|
|
|
|
|
|
|
if (!(cfile.fp = fopen( cfile.file, "r" ))) {
|
|
|
|
|
sys_error( "Cannot open config file '%s'", cfile.file );
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
buf[sizeof(buf) - 1] = 0;
|
|
|
|
|
cfile.buf = buf;
|
|
|
|
|
cfile.bufl = sizeof(buf) - 1;
|
|
|
|
|
cfile.line = 0;
|
|
|
|
|
cfile.err = 0;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
cfile.ms_warn = 0;
|
|
|
|
|
cfile.rest = NULL;
|
|
|
|
|
|
|
|
|
|
gcops = 0;
|
|
|
|
|
glob_ok = 1;
|
|
|
|
|
global_conf.expire_unread = -1;
|
|
|
|
|
reloop:
|
|
|
|
|
while (getcline( &cfile )) {
|
|
|
|
|
if (!cfile.cmd)
|
|
|
|
|
continue;
|
|
|
|
|
for (i = 0; i < N_DRIVERS; i++)
|
|
|
|
|
if (drivers[i]->parse_store( &cfile, &store )) {
|
|
|
|
|
if (store) {
|
|
|
|
|
if (!store->max_size)
|
|
|
|
|
store->max_size = UINT_MAX;
|
|
|
|
|
if (!store->flat_delim)
|
|
|
|
|
store->flat_delim = "";
|
|
|
|
|
*storeapp = store;
|
|
|
|
|
storeapp = &store->next;
|
|
|
|
|
*storeapp = NULL;
|
|
|
|
|
}
|
|
|
|
|
glob_ok = 0;
|
|
|
|
|
goto reloop;
|
|
|
|
|
}
|
|
|
|
|
if (!strcasecmp( "Channel", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
channel = nfcalloc( sizeof(*channel) );
|
|
|
|
|
channel->name = nfstrdup( cfile.val );
|
|
|
|
|
channel->max_messages = global_conf.max_messages;
|
|
|
|
|
channel->expire_unread = global_conf.expire_unread;
|
|
|
|
|
channel->use_internal_date = global_conf.use_internal_date;
|
|
|
|
|
cops = 0;
|
|
|
|
|
max_size = UINT_MAX;
|
|
|
|
|
while (getcline( &cfile ) && cfile.cmd) {
|
|
|
|
|
if (!strcasecmp( "MaxSize", cfile.cmd ))
|
|
|
|
|
max_size = parse_size( &cfile );
|
|
|
|
|
else if (!strcasecmp( "Pattern", cfile.cmd ) ||
|
|
|
|
|
!strcasecmp( "Patterns", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
arg = cfile.val;
|
|
|
|
|
do
|
|
|
|
|
add_string_list( &channel->patterns, arg );
|
|
|
|
|
while ((arg = get_arg( &cfile, ARG_OPTIONAL, NULL )));
|
|
|
|
|
}
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
else if (!strcasecmp( "Far", cfile.cmd )) {
|
|
|
|
|
fn = F;
|
|
|
|
|
goto linkst;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
} else if (!strcasecmp( "Master", cfile.cmd )) { // Pre-1.4 legacy
|
|
|
|
|
fn = F;
|
|
|
|
|
goto olinkst;
|
|
|
|
|
} else if (!strcasecmp( "Near", cfile.cmd )) {
|
|
|
|
|
fn = N;
|
|
|
|
|
goto linkst;
|
|
|
|
|
} else if (!strcasecmp( "Slave", cfile.cmd )) { // Pre-1.4 legacy
|
|
|
|
|
fn = N;
|
|
|
|
|
olinkst:
|
|
|
|
|
cfile.ms_warn = 1;
|
|
|
|
|
linkst:
|
|
|
|
|
if (*cfile.val != ':' || !(p = strchr( cfile.val + 1, ':' ))) {
|
|
|
|
|
error( "%s:%d: malformed mailbox spec\n",
|
|
|
|
|
cfile.file, cfile.line );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
*p = 0;
|
|
|
|
|
for (store = stores; store; store = store->next)
|
|
|
|
|
if (!strcmp( store->name, cfile.val + 1 )) {
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
channel->stores[fn] = store;
|
|
|
|
|
goto stpcom;
|
|
|
|
|
}
|
|
|
|
|
error( "%s:%d: unknown store '%s'\n",
|
|
|
|
|
cfile.file, cfile.line, cfile.val + 1 );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
continue;
|
|
|
|
|
stpcom:
|
|
|
|
|
if (*++p)
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
channel->boxes[fn] = nfstrdup( p );
|
|
|
|
|
} else if (!getopt_helper( &cfile, &cops, channel )) {
|
|
|
|
|
error( "%s:%d: keyword '%s' is not recognized in Channel sections\n",
|
|
|
|
|
cfile.file, cfile.line, cfile.cmd );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
if (!channel->stores[F]) {
|
|
|
|
|
error( "channel '%s' refers to no far side store\n", channel->name );
|
|
|
|
|
cfile.err = 1;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
} else if (!channel->stores[N]) {
|
|
|
|
|
error( "channel '%s' refers to no near side store\n", channel->name );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
} else if (merge_ops( cops, channel->ops ))
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
else {
|
|
|
|
|
if (max_size != UINT_MAX) {
|
|
|
|
|
if (!max_size)
|
|
|
|
|
max_size = UINT_MAX;
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
channel->stores[F]->max_size = channel->stores[N]->max_size = max_size;
|
|
|
|
|
}
|
|
|
|
|
*channelapp = channel;
|
|
|
|
|
channelapp = &channel->next;
|
|
|
|
|
}
|
|
|
|
|
glob_ok = 0;
|
|
|
|
|
goto reloop;
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp( "Group", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
group = nfmalloc( sizeof(*group) );
|
|
|
|
|
group->name = nfstrdup( cfile.val );
|
|
|
|
|
*groupapp = group;
|
|
|
|
|
groupapp = &group->next;
|
|
|
|
|
*groupapp = NULL;
|
|
|
|
|
chanlistapp = &group->channels;
|
|
|
|
|
*chanlistapp = NULL;
|
|
|
|
|
while ((arg = get_arg( &cfile, ARG_OPTIONAL, NULL ))) {
|
|
|
|
|
addone:
|
|
|
|
|
len = strlen( arg );
|
|
|
|
|
chanlist = nfmalloc( sizeof(*chanlist) + len );
|
|
|
|
|
memcpy( chanlist->string, arg, len + 1 );
|
|
|
|
|
*chanlistapp = chanlist;
|
|
|
|
|
chanlistapp = &chanlist->next;
|
|
|
|
|
*chanlistapp = NULL;
|
|
|
|
|
}
|
|
|
|
|
while (getcline( &cfile ) && cfile.cmd) {
|
|
|
|
|
if (!strcasecmp( "Channel", cfile.cmd ) ||
|
|
|
|
|
!strcasecmp( "Channels", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
arg = cfile.val;
|
|
|
|
|
goto addone;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
error( "%s:%d: keyword '%s' is not recognized in Group sections\n",
|
|
|
|
|
cfile.file, cfile.line, cfile.cmd );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
glob_ok = 0;
|
|
|
|
|
goto reloop;
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp( "FSync", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
UseFSync = parse_bool( &cfile );
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp( "FieldDelimiter", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
if (strlen( cfile.val ) != 1) {
|
|
|
|
|
error( "%s:%d: Field delimiter must be exactly one character long\n", cfile.file, cfile.line );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
} else {
|
|
|
|
|
FieldDelimiter = cfile.val[0];
|
|
|
|
|
if (!ispunct( FieldDelimiter )) {
|
|
|
|
|
error( "%s:%d: Field delimiter must be a punctuation character\n", cfile.file, cfile.line );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!strcasecmp( "BufferLimit", cfile.cmd ))
|
|
|
|
|
{
|
|
|
|
|
BufferLimit = parse_size( &cfile );
|
|
|
|
|
if (!BufferLimit) {
|
|
|
|
|
error( "%s:%d: BufferLimit cannot be zero\n", cfile.file, cfile.line );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!getopt_helper( &cfile, &gcops, &global_conf ))
|
|
|
|
|
{
|
|
|
|
|
error( "%s:%d: '%s' is not a recognized section-starting or global keyword\n",
|
|
|
|
|
cfile.file, cfile.line, cfile.cmd );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
while (getcline( &cfile ))
|
|
|
|
|
if (!cfile.cmd)
|
|
|
|
|
goto reloop;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!glob_ok) {
|
|
|
|
|
error( "%s:%d: global options may not follow sections\n",
|
|
|
|
|
cfile.file, cfile.line );
|
|
|
|
|
cfile.err = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fclose (cfile.fp);
|
deprecate master/slave terminology
the underlying metaphor refers to an inhumane practice, so using it
casually is rightfully offensive to many people. it isn't even a
particularly apt metaphor, as it suggests a strict hierarchy that is
counter to mbsync's highly symmetrical mode of operation.
the far/near terminology has been chosen as the replacement, as it is a
natural fit for the push/pull terminology. on the downside, due to these
not being nouns, a few uses are a bit awkward, and several others had to
be amended to include 'side'. also, it's conceptually quite close to
remote/local, which matches the typical use case, but is maybe a bit too
suggestive of actually non-existing limitations.
the new f/n suffixes of the -C/-R/-X options clash with pre-existing
options, so direct concatenation of short options is even less practical
than before (some suffixes of -D already clashed), but doing that leads
to unreadable command lines anyway.
as with previous deprecations, all pre-existing command line and config
options keep working, but yield a warning. the state files are silently
upgraded.
5 years ago
|
|
|
if (cfile.ms_warn)
|
|
|
|
|
warn( "Notice: Master/Slave are deprecated; use Far/Near instead.\n" );
|
|
|
|
|
cfile.err |= merge_ops( gcops, global_conf.ops );
|
|
|
|
|
if (!global_conf.sync_state)
|
|
|
|
|
global_conf.sync_state = expand_strdup( "~/." EXE "/" );
|
|
|
|
|
return cfile.err;
|
|
|
|
|
}
|
