isync

commit 03a124051f86e6a7de70ed357764dfc22b185322
parent 0e1f8f9a3f8aa1d84894ed0addac398cd709bb81
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Thu, 26 Mar 2015 18:09:25 +0100

add debugging for main()

so far, that's mostly mailbox listing

Diffstat:
M
src/common.h
 | 
1
+
M
src/main.c
 | 
28
++++++++++++++++++++++++++--
M
src/mbsync.1
 | 
6
++++--

3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/common.h b/src/common.h
@@ -64,6 +64,7 @@ typedef unsigned int uint;
 #define DEBUG_NET       0x04
 #define DEBUG_NET_ALL   0x08
 #define DEBUG_SYNC      0x10
+#define DEBUG_MAIN      0x20
 #define DEBUG_ALL       (0xFF & ~DEBUG_NET_ALL)
 #define QUIET           0x100
 #define VERYQUIET       0x200
diff --git a/src/main.c b/src/main.c
@@ -99,6 +99,16 @@ PACKAGE " " VERSION " - mailbox synchronizer\n"
 	exit( code );
 }
 
+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__
 static void
 crashHandler( int n )
@@ -433,6 +443,8 @@ main( int argc, char **argv )
 						op = DEBUG_CRASH;
 					else if (!strcmp( opt, "-maildir" ))
 						op = VERBOSE | DEBUG_MAILDIR;
+					else if (!strcmp( opt, "-main" ))
+						op = VERBOSE | DEBUG_MAIN;
 					else if (!strcmp( opt, "-net" ))
 						op = VERBOSE | DEBUG_NET;
 					else if (!strcmp( opt, "-net-all" ))
@@ -618,6 +630,9 @@ main( int argc, char **argv )
 				case 'm':
 					op |= DEBUG_MAILDIR | VERBOSE;
 					break;
+				case 'M':
+					op |= DEBUG_MAIN | VERBOSE;
+					break;
 				case 'n':
 					op |= DEBUG_NET | VERBOSE;
 					break;
@@ -918,6 +933,8 @@ store_opened( store_t *ctx, void *aux )
 				} else {
 					flags |= LIST_PATH;
 				}
+				debug( "pattern '%s' (effective '%s'): %sPath, %sINBOX\n",
+				       pat, buf, (flags & LIST_PATH) ? "" : "no ",  (flags & LIST_INBOX) ? "" : "no ");
 			}
 		}
 		set_bad_callback( ctx, store_bad, AUX );
@@ -932,13 +949,18 @@ static void
 store_listed( int sts, void *aux )
 {
 	MVARS(aux)
-	string_list_t **box;
+	string_list_t **box, *bx;
 
 	switch (sts) {
 	case DRV_CANCELED:
 		return;
 	case DRV_OK:
 		mvars->ctx[t]->listed = 1;
+		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 );
+		}
 		if (mvars->ctx[t]->conf->flat_delim) {
 			for (box = &mvars->ctx[t]->boxes; *box; box = &(*box)->next) {
 				string_list_t *nbox;
@@ -952,8 +974,10 @@ store_listed( int sts, void *aux )
 				}
 			}
 		}
-		if (mvars->ctx[t]->conf->map_inbox)
+		if (mvars->ctx[t]->conf->map_inbox) {
+			debug( "adding mapped inbox to %s: %s\n", str_ms[t], mvars->ctx[t]->conf->map_inbox );
 			add_string_list( &mvars->ctx[t]->boxes, mvars->ctx[t]->conf->map_inbox );
+		}
 		break;
 	default:
 		mvars->ret = mvars->skip = 1;
diff --git a/src/mbsync.1 b/src/mbsync.1
@@ -80,14 +80,16 @@ Display version information.
 \fB-V\fR, \fB--verbose\fR
 Enable \fIverbose\fR mode, which displays what is currently happening.
 .TP
-\fB-D\fR[\fBC\fR][\fBm\fR][\fBn\fR|\fBN\fR][\fBs\fR]\fR]\fR,\
- \fB--debug\fR[\fB-crash\fR|\fB-maildir\fR|\fB-net\fR|\fB-net-all\fR|\fB-sync\fR]
+\fB-D\fR[\fBC\fR][\fBm\fR][\fBM\fR][\fBn\fR|\fBN\fR][\fBs\fR]\fR]\fR,\
+ \fB--debug\fR[\fB-crash\fR|\fB-maildir\fR|\fB-main\fR|\fB-net\fR|\fB-net-all\fR|\fB-sync\fR]
 Enable debugging categories:
 .in +4
 \fBC\fR, \fBcrash\fR - use built-in crash handler
 .br
 \fBm\fR, \fBmaildir\fR - print maildir debug info
 .br
+\fBM\fR, \fBmain\fR - print main debug info
+.br
 \fBn\fR, \fBnet\fR - print network traffic (protocol only)
 .br
 \fBN\fR, \fBnet-all\fR - print network traffic (including payloads)