Skip to content

Fix gbak output some errors and warnings to stderr instead of stdout #8793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix gbak output some errors and warnings to stderr instead of stdout #8793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/burp/backup.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ void put_array( burp_fld* field, burp_rel* relation, ISC_QUAD* blob_id)
if (!status_vector.isSuccess())
{
BurpMaster master;
BURP_print(false, 81, field->fld_name);
BURP_print(true, 81, field->fld_name);
// msg 81 error accessing blob field %s -- continuing
BURP_print_status(false, &status_vector);
#ifdef DEBUG
Expand Down Expand Up @@ -1235,7 +1235,7 @@ void put_asciz( const att_type attribute, const TEXT* string)
// We can't honor operating systems that allow longer file names.
if (len >= MAX_FILE_NAME_SIZE)
{
BURP_print(false, 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
len = MAX_FILE_NAME_SIZE - 1;
}
Expand Down Expand Up @@ -1276,7 +1276,7 @@ void put_blob( burp_fld* field, ISC_QUAD& blob_id)
if (!blob.open(DB, gds_trans, blob_id))
{
BurpMaster master;
BURP_print(false, 81, field->fld_name);
BURP_print(true, 81, field->fld_name);
// msg 81 error accessing blob field %s -- continuing
BURP_print_status(false, &status_vector);
return;
Expand Down
18 changes: 9 additions & 9 deletions src/burp/burp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1795,19 +1795,19 @@ void BURP_print_status(bool err, const Firebird::IStatus* status_vector, USHORT
SCHAR s[1024];
if (fb_interpret(s, sizeof(s), &vector))
{
BURP_msg_partial(err, 256); // msg 256: gbak: ERROR:
burp_output(err, "%s\n", s);
BURP_msg_partial(true, 256); // msg 256: gbak: ERROR:
burp_output(true, "%s\n", s);

while (fb_interpret(s, sizeof(s), &vector))
{
BURP_msg_partial(err, 256); // msg 256: gbak: ERROR:
burp_output(err, " %s\n", s);
BURP_msg_partial(true, 256); // msg 256: gbak: ERROR:
burp_output(true, " %s\n", s);
}
}

if (secondNumber)
{
BURP_msg_partial(err, 169); // msg 169: gbak:
BURP_msg_partial(true, 169); // msg 169: gbak:
BURP_msg_put(true, secondNumber, SafeArg());
}
}
Expand Down Expand Up @@ -1850,13 +1850,13 @@ void BURP_print_warning(const Firebird::IStatus* status, bool printErrorAsWarnin

if (fb_interpret(s, sizeof(s), &vector))
{
BURP_msg_partial(false, 255); // msg 255: gbak: WARNING:
burp_output(false, "%s\n", s);
BURP_msg_partial(true, 255); // msg 255: gbak: WARNING:
burp_output(true, "%s\n", s);

while (fb_interpret(s, sizeof(s), &vector))
{
BURP_msg_partial(false, 255); // msg 255: gbak: WARNING:
burp_output(false, " %s\n", s);
BURP_msg_partial(true, 255); // msg 255: gbak: WARNING:
burp_output(true, " %s\n", s);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/burp/mvol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ static void put_asciz(SCHAR attribute, const TEXT* str)
USHORT l = static_cast<USHORT>(strlen(str));
if (l > MAX_UCHAR)
{
BURP_print(false, 343, SafeArg() << int(attribute) << "put_asciz()" << USHORT(MAX_UCHAR));
BURP_print(true, 343, SafeArg() << int(attribute) << "put_asciz()" << USHORT(MAX_UCHAR));
// msg 343: text for attribute @1 is too large in @2, truncating to @3 bytes
l = MAX_UCHAR;
}
Expand Down
41 changes: 20 additions & 21 deletions src/burp/restore.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ void activateIndex(BurpGlobals* tdgbl, const QualifiedMetaString& indexName)

if (fError)
{
BURP_print(false, 173, indexName.toQuotedString().c_str());
BURP_print(true, 173, indexName.toQuotedString().c_str());
BURP_print_status(false, &local_status_vector);
tdgbl->flag_on_line = false;

Expand Down Expand Up @@ -378,25 +378,25 @@ int RESTORE_restore (const TEXT* file_name, const TEXT* database_name)
MODIFY IDX USING
IDX.RDB$INDEX_INACTIVE = TRUE;
END_MODIFY;
BURP_print(false, 240, indexName.toQuotedString().c_str());
BURP_print(true, 240, indexName.toQuotedString().c_str());
// msg 240 Index \"%s\" failed to activate because:

if (error_code == isc_no_dup)
{
BURP_print(false, 241);
BURP_print(true, 241);
// msg 241 The unique index has duplicate values or NULLs
BURP_print(false, 242);
BURP_print(true, 242);
// msg 242 Delete or Update duplicate values or NULLs, and activate index with
}
else
{
BURP_print(false, 244);
BURP_print(true, 244);
// msg 244 Not enough disk space to create the sort file for an index
BURP_print(false, 245);
BURP_print(true, 245);
// msg 245 Set the TMP environment variable to a directory on a filesystem that does have enough space, and activate index with
}

BURP_print(false, 243, indexName.toQuotedString().c_str());
BURP_print(true, 243, indexName.toQuotedString().c_str());
// msg 243 ALTER INDEX \"%s\" ACTIVE;
}
END_FOR
Expand Down Expand Up @@ -765,7 +765,7 @@ void add_files(BurpGlobals* tdgbl, const char* file_name)
COMMIT
// existing ON_ERROR continues past error, beck
ON_ERROR
BURP_print (false, 174);
BURP_print (true, 174);
// msg 174 cannot commit files
BURP_print_status (false, &tdgbl->status_vector);
ROLLBACK;
Expand Down Expand Up @@ -2116,7 +2116,7 @@ void get_array(BurpGlobals* tdgbl, burp_rel* relation, UCHAR* record_buffer)
elements_written * field->fld_length, (*buffer) + data_at);
if (status_vector->hasData())
{
BURP_print (false, 81, field->fld_name);
BURP_print (true, 81, field->fld_name);
// msg 81 error accessing blob field %s -- continuing
BURP_print_status (true, &status_vector);
#ifdef DEBUG
Expand Down Expand Up @@ -3143,9 +3143,9 @@ static void check_data_error(BurpGlobals* tdgbl, IStatus* status_vector, const b
{
if (tdgbl->gbl_sw_incremental)
{
BURP_print(false, 138, relation->rel_name.toQuotedString().c_str());
BURP_print(true, 138, relation->rel_name.toQuotedString().c_str());
// msg 138 validation error on field in relation %s
BURP_print_status (false, status_vector);
BURP_print_status(false, status_vector);
}
else
BURP_error_redirect(status_vector, 47);
Expand All @@ -3155,9 +3155,8 @@ static void check_data_error(BurpGlobals* tdgbl, IStatus* status_vector, const b
{
if (tdgbl->gbl_sw_incremental)
{
BURP_print(true, 114, relation->rel_name.toQuotedString().c_str());
// msg 114 restore failed for record in relation %s
BURP_print(false, 114, relation->rel_name.toQuotedString().c_str());

BURP_print_status(false, status_vector, 342); // isc_gbak_invalid_data
}
else
Expand All @@ -3167,7 +3166,7 @@ static void check_data_error(BurpGlobals* tdgbl, IStatus* status_vector, const b
{
if (tdgbl->gbl_sw_incremental && isc_sqlcode(status_vector->getErrors()) != -902)
{
BURP_print (false, 114, relation->rel_name.toQuotedString().c_str());
BURP_print(true, 114, relation->rel_name.toQuotedString().c_str());
// msg 114 restore failed for record in relation %s
BURP_print_status(false, status_vector);
}
Expand Down Expand Up @@ -3214,25 +3213,25 @@ static void commit_relation_data(BurpGlobals* tdgbl, burp_rel* relation)
{
IDX.RDB$INDEX_INACTIVE = TRUE;

BURP_print(false, 240, indexName.toQuotedString().c_str());
BURP_print(true, 240, indexName.toQuotedString().c_str());
// msg 240 Index \"%s\" failed to activate because:

if (error_code == isc_no_dup)
{
BURP_print(false, 241);
BURP_print(true, 241);
// msg 241 The unique index has duplicate values or NULLs
BURP_print(false, 242);
BURP_print(true, 242);
// msg 242 Delete or Update duplicate values or NULLs, and activate index with
}
else
{
BURP_print(false, 244);
BURP_print(true, 244);
// msg 244 Not enough disk space to create the sort file for an index
BURP_print(false, 245);
BURP_print(true, 245);
// msg 245 Set the TMP environment variable to a directory on a filesystem that does have enough space, and activate index with
}

BURP_print(false, 243, indexName.toQuotedString().c_str());
BURP_print(true, 243, indexName.toQuotedString().c_str());
// msg 243 ALTER INDEX \"%s\" ACTIVE
}
END_MODIFY
Expand All @@ -3246,7 +3245,7 @@ static void commit_relation_data(BurpGlobals* tdgbl, burp_rel* relation)
break;

default:
BURP_print(false, 69, relation->rel_name.toQuotedString().c_str());
BURP_print(true, 69, relation->rel_name.toQuotedString().c_str());
// msg 69 commit failed on relation %s
BURP_print_status(false, &tdgbl->status_vector);
ROLLBACK;
Expand Down
Loading