Fixed CORE-2984: gbak -v srv:db stdout creates a broken backup

FirebirdSQL · May 6, 2010 · 965b851 · 965b851
1 parent cc2f463
commit 965b851
Show file tree

Hide file tree

Showing 17 changed files with 338 additions and 277 deletions.
diff --git a/src/alice/alice.cpp b/src/alice/alice.cpp
@@ -687,6 +687,6 @@ static void alice_output(const SCHAR* format, ...)
 	buf.vprintf(format, arglist);
 	va_end(arglist);
 
-	tdgbl->uSvc->output(buf.c_str());
+	tdgbl->uSvc->outputError(buf.c_str());
 }
 
diff --git a/src/burp/OdsDetection.epp b/src/burp/OdsDetection.epp
@@ -65,7 +65,7 @@ DATABASE DB = STATIC FILENAME "yachts.lnk";
 
 #define DB			tdgbl->db_handle
 #define gds_trans	tdgbl->tr_handle
-#define isc_status	tdgbl->status
+#define isc_status	tdgbl->status_vector
 
 
 void detectRuntimeODS()

diff --git a/src/burp/backup.epp b/src/burp/backup.epp
@@ -73,7 +73,7 @@ DATABASE DB = STATIC FILENAME "yachts.lnk" RUNTIME * dbb_file;
 
 #define DB			tdgbl->db_handle
 #define gds_trans	tdgbl->tr_handle
-#define isc_status	tdgbl->status
+#define isc_status	tdgbl->status_vector
 
 namespace // unnamed, private
 {
@@ -1110,7 +1110,7 @@ void put_array( burp_fld* field, burp_rel* relation, ISC_QUAD* blob_id)
 					  NULL,	// param for subset of an array handling
 					  slice_length, slice, (SLONG*) &return_length))
 	{
-		BURP_print(81, field->fld_name);
+		BURP_print(true, 81, field->fld_name);
 		// msg 81 error accessing blob field %s -- continuing
 		BURP_print_status(status_vector);
 #ifdef DEBUG
@@ -1215,7 +1215,7 @@ void put_asciz( const att_type attribute, const TEXT* string)
 	// We can't honor operating systems that allow longer file names.
 	if (l >= MAX_FILE_NAME_SIZE)
 	{
-		BURP_print(343, SafeArg() << int(attribute) << "put_asciz()" << (MAX_FILE_NAME_SIZE - 1));
+		BURP_print(true, 343, SafeArg() << int(attribute) << "put_asciz()" << (MAX_FILE_NAME_SIZE - 1));
 		// msg 343: text for attribute @1 is too large in @2, truncating to @3 bytes
 		l = MAX_FILE_NAME_SIZE - 1;
 	}
@@ -1255,7 +1255,7 @@ void put_blob( burp_fld* field, ISC_QUAD& blob_id)
 
 	if (!blob.open(DB, gds_trans, blob_id))
 	{
-		BURP_print(81, field->fld_name);
+		BURP_print(true, 81, field->fld_name);
 		// msg 81 error accessing blob field %s -- continuing
 		BURP_print_status(status_vector);
 		return;
@@ -1426,7 +1426,7 @@ bool put_blr_blob( att_type attribute, ISC_QUAD& blob_id)
 			break;
 
 		default:
-			BURP_print(79, SafeArg() << int(item));
+			BURP_print(true, 79, SafeArg() << int(item));
 			// msg 79 don't understand blob info item %ld
 			if (!blob.close())
 				BURP_error_redirect(status_vector, 23);
@@ -1854,7 +1854,7 @@ void put_index( burp_rel* relation)
 
 		if (count != (ULONG) X.RDB$SEGMENT_COUNT)
 		{
-			BURP_print(180, SafeArg() << X.RDB$INDEX_NAME << count << X.RDB$SEGMENT_COUNT);
+			BURP_print(true, 180, SafeArg() << X.RDB$INDEX_NAME << count << X.RDB$SEGMENT_COUNT);
 			continue;
 		}
 
@@ -2269,7 +2269,7 @@ bool put_source_blob(att_type attribute, att_type old_attribute, ISC_QUAD& blob_
 			break;
 
 		default:
-			BURP_print(79, SafeArg() << int(item));
+			BURP_print(true, 79, SafeArg() << int(item));
 			// msg 79 don't understand blob info item %ld
 			if (!blob.close())
 			{
@@ -2352,7 +2352,7 @@ int put_text( att_type attribute, const TEXT* text, SSHORT size_len)
 	fb_assert(l <= MAX_UCHAR);
 	if (l > MAX_UCHAR)
 	{
-		BURP_print(343, SafeArg() << int(attribute) << "put_text()" << MAX_UCHAR);
+		BURP_print(true, 343, SafeArg() << int(attribute) << "put_text()" << MAX_UCHAR);
 		// msg 343: text for attribute @1 is too large in @2, truncating to @3 bytes
 		l = MAX_UCHAR;
 	}