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.
This commit is contained in:
parent
c9b52f5aec
commit
f74b4e0d11
|
@ -100,7 +100,6 @@ typedef unsigned long ulong;
|
||||||
#define DEBUG_MAIN 0x20
|
#define DEBUG_MAIN 0x20
|
||||||
#define DEBUG_DRV 0x40
|
#define DEBUG_DRV 0x40
|
||||||
#define DEBUG_DRV_ALL 0x80
|
#define DEBUG_DRV_ALL 0x80
|
||||||
#define DEBUG_ALL (0xFF & ~(DEBUG_NET_ALL | DEBUG_DRV_ALL))
|
|
||||||
#define QUIET 0x100
|
#define QUIET 0x100
|
||||||
#define VERYQUIET 0x200
|
#define VERYQUIET 0x200
|
||||||
#define PROGRESS 0x400
|
#define PROGRESS 0x400
|
||||||
|
@ -109,6 +108,9 @@ typedef unsigned long ulong;
|
||||||
#define ZERODELAY 0x2000
|
#define ZERODELAY 0x2000
|
||||||
#define FORCEASYNC 0x4000
|
#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 DFlags;
|
||||||
extern int JLimit;
|
extern int JLimit;
|
||||||
extern int UseFSync;
|
extern int UseFSync;
|
||||||
|
|
|
@ -741,7 +741,7 @@ main( int argc, char **argv )
|
||||||
if (ms_warn)
|
if (ms_warn)
|
||||||
warn( "Notice: -master/-slave/m/s suffixes are deprecated; use -far/-near/f/n instead.\n" );
|
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;
|
DFlags |= PROGRESS;
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
|
Loading…
Reference in New Issue
Block a user