Browse Source

info() about opening of stores

wip/maildir-uid-dupes-test
Oswald Buddenhagen 19 years ago
parent
commit
72a2d4b690
  1. 2
      src/isync.h
  2. 11
      src/main.c
  3. 2
      src/sync.c

2
src/isync.h

@ -246,6 +246,8 @@ unsigned char arc4_getbyte( void );
/* sync.c */ /* sync.c */
extern const char *str_ms[2], *str_hl[2];
#define SYNC_OK 0 #define SYNC_OK 0
#define SYNC_FAIL 1 #define SYNC_FAIL 1
#define SYNC_BAD(ms) (2+(ms)) #define SYNC_BAD(ms) (2+(ms))

11
src/main.c

@ -481,17 +481,20 @@ main( int argc, char **argv )
merge_actions( chan, ops, XOP_HAVE_CREATE, OP_CREATE, 0 ); merge_actions( chan, ops, XOP_HAVE_CREATE, OP_CREATE, 0 );
merge_actions( chan, ops, XOP_HAVE_EXPUNGE, OP_EXPUNGE, 0 ); merge_actions( chan, ops, XOP_HAVE_EXPUNGE, OP_EXPUNGE, 0 );
info( "Channel %s\n", chan->name );
boxes[M] = boxes[S] = cboxes = 0; boxes[M] = boxes[S] = cboxes = 0;
for (t = 0; t < 2; t++) { for (t = 0; t < 2; t++) {
driver[t] = chan->stores[t]->driver; driver[t] = chan->stores[t]->driver;
ctx[t] = driver[t]->own_store( chan->stores[t] ); ctx[t] = driver[t]->own_store( chan->stores[t] );
} }
for (t = 0; t < 2; t++) for (t = 0; t < 2; t++)
if (!ctx[t] && !(ctx[t] = driver[t]->open_store( chan->stores[t] ))) { if (!ctx[t]) {
ret = 1; info( "Opening %s %s...\n", str_ms[t], chan->stores[t]->name );
goto next; if (!(ctx[t] = driver[t]->open_store( chan->stores[t] ))) {
ret = 1;
goto next;
}
} }
info( "Channel %s\n", chan->name );
if (list && multiple) if (list && multiple)
printf( "%s:\n", chan->name ); printf( "%s:\n", chan->name );
if (boxlist) { if (boxlist) {

2
src/sync.c

@ -33,7 +33,7 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
static const char *str_ms[] = { "master", "slave" }, *str_hl[] = { "push", "pull" }; const char *str_ms[] = { "master", "slave" }, *str_hl[] = { "push", "pull" };
void void
Fclose( FILE *f ) Fclose( FILE *f )

Loading…
Cancel
Save