Make sure debug() never alters errno, so that it can safely be called between an error and calling wperror()

darcs-hash:20061214100131-ac50b-b1c2e4819567fc35858233c265a26b934620fc6d.gz

1 files changed, 7 insertions, 2 deletions

diff --git a/common.c b/common.c
index a63cbce9..cef60d0d 100644
--- a/common.c
+++ b/common.c
@@ -548,14 +548,17 @@ int read_blocked(int fd, void *buf, size_t count)
 void debug( int level, const wchar_t *msg, ... )
 {
 	va_list va;
+
 	string_buffer_t sb;
 	string_buffer_t sb2;
+
+	int errno_old = errno;
 	
-	CHECK( msg, );
-		
 	if( level > debug_level )
 		return;
 
+	CHECK( msg, );
+		
 	sb_init( &sb );
 	sb_init( &sb2 );
 
@@ -570,6 +573,8 @@ void debug( int level, const wchar_t *msg, ... )
 
 	sb_destroy( &sb );	
 	sb_destroy( &sb2 );	
+
+	errno = errno_old;
 }
 
 void write_screen( const wchar_t *msg, string_buffer_t *buff )