isync

commit f74b4e0d1168037fbbd9ea80dfe6e3d215fa2401
parent c9b52f5aec968e01efb971694af177d3463253c4
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Wed,  1 Jun 2022 11:57:50 +0200

fix --debug-crash suppressing the progress display

there isn't really a reason for that; DEBUG_CRASH is quite unlike the
other DEBUG_ flags.

note that the DEBUG_*_ALL flags are not checked, because they always
come with their corresponding less verbose flag anyway.

Diffstat:
M
src/common.h
 | 
4
+++-
M
src/main.c
 | 
2
+-

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/common.h b/src/common.h
@@ -100,7 +100,6 @@ typedef unsigned long ulong;
 #define DEBUG_MAIN      0x20
 #define DEBUG_DRV       0x40
 #define DEBUG_DRV_ALL   0x80
-#define DEBUG_ALL       (0xFF & ~(DEBUG_NET_ALL | DEBUG_DRV_ALL))
 #define QUIET           0x100
 #define VERYQUIET       0x200
 #define PROGRESS        0x400
@@ -109,6 +108,9 @@ typedef unsigned long ulong;
 #define ZERODELAY       0x2000
 #define FORCEASYNC      0x4000
 
+#define DEBUG_ANY (DEBUG_MAILDIR | DEBUG_NET | DEBUG_SYNC | DEBUG_MAIN | DEBUG_DRV)
+#define DEBUG_ALL (DEBUG_ANY | DEBUG_CRASH)
+
 extern int DFlags;
 extern int JLimit;
 extern int UseFSync;
diff --git a/src/main.c b/src/main.c
@@ -741,7 +741,7 @@ main( int argc, char **argv )
 	if (ms_warn)
 		warn( "Notice: -master/-slave/m/s suffixes are deprecated; use -far/-near/f/n instead.\n" );
 
-	if (!(DFlags & (QUIET | DEBUG_ALL)) && isatty( 1 ))
+	if (!(DFlags & (QUIET | DEBUG_ANY)) && isatty( 1 ))
 		DFlags |= PROGRESS;
 
 #ifdef __linux__