From 66fae9059bb3f26f1944b25a32c8a199ded9f70f Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 23 Oct 2017 18:26:02 +0200 Subject: [PATCH] Add missing copy-plugin-confs for regress --- bacula/src/findlib/bfile.c | 10 +++++++--- regress/scripts/copy-plugin-confs | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 regress/scripts/copy-plugin-confs diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c index 067677dc45..3c6e611874 100644 --- a/bacula/src/findlib/bfile.c +++ b/bacula/src/findlib/bfile.c @@ -582,6 +582,7 @@ int bclose(BFILE *bfd) stat = plugin_bclose(bfd); bfd->fid = -1; bfd->cmd_plugin = false; + return stat; } #if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_DONTNEED) @@ -626,10 +627,13 @@ ssize_t bwrite(BFILE *bfd, void *buf, size_t count) ssize_t stat; if (bfd->cmd_plugin && plugin_bwrite) { - return plugin_bwrite(bfd, buf, count); + stat = plugin_bwrite(bfd, buf, count); + + } else { + stat = write(bfd->fid, buf, count); + bfd->berrno = errno; } - stat = write(bfd->fid, buf, count); - bfd->berrno = errno; + bfd->block++; if (stat > 0) { bfd->total_bytes += stat; diff --git a/regress/scripts/copy-plugin-confs b/regress/scripts/copy-plugin-confs new file mode 100755 index 0000000000..40b4a0ac35 --- /dev/null +++ b/regress/scripts/copy-plugin-confs @@ -0,0 +1,8 @@ +#!/bin/sh +cp -f scripts/plugin-test-bacula-dir.conf ${conf}/bacula-dir.conf +cp -f scripts/test-bacula-sd.conf ${conf}/bacula-sd.conf +cp -f scripts/test-bacula-fd.conf ${conf}/bacula-fd.conf +cp -f scripts/test-console.conf ${conf}/bconsole.conf +cp -f scripts/test-console.conf ${conf}/bat.conf + +scripts/set_tape_options -- 2.39.5