From e92c9562e52ea7ea369ec027594383f673b05ea1 Mon Sep 17 00:00:00 2001 From: Alain Spineux Date: Wed, 15 Feb 2023 20:39:40 +0100 Subject: [PATCH] win32: typos & comments --- bacula/src/filed/fd_snapshot.c | 1 + bacula/src/findlib/find_one.c | 2 +- bacula/src/findlib/match.c | 2 +- bacula/src/win32/makeall | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bacula/src/filed/fd_snapshot.c b/bacula/src/filed/fd_snapshot.c index b990f847c..980b1c1b2 100644 --- a/bacula/src/filed/fd_snapshot.c +++ b/bacula/src/filed/fd_snapshot.c @@ -1819,6 +1819,7 @@ bool snapshot_convert_path(JCR *jcr, FF_PKT *ff, dlist *filelist, dlistString *n make_win32_path_UTF8_2_wchar(&wpath.addr(), ff->top_fname); wchar_t *p = (wchar_t *)wpath.c_str(); Dmsg2(10, "ASX Convert wchart %s => %ls\n", ff->top_fname, p); + /* ff->top_fname = "C:/" => p = "\\?\C:\" */ DWORD len = wcslen(p); #if 0 // remove any trailing '/' or '\\' diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c index a9238b640..2bf988bd2 100644 --- a/bacula/src/findlib/find_one.c +++ b/bacula/src/findlib/find_one.c @@ -417,7 +417,7 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, return handle_file(jcr, ff_pkt, top_level); } - Dmsg1(300, "File ----: %s\n", fname); + Dmsg2(300, "File ----: %s snap=%s\n", fname, snap_fname); /* Save current times of this directory in case we need to * reset them because the user doesn't want them changed. diff --git a/bacula/src/findlib/match.c b/bacula/src/findlib/match.c index 7bac944ce..7f6116c31 100644 --- a/bacula/src/findlib/match.c +++ b/bacula/src/findlib/match.c @@ -66,7 +66,7 @@ match_files(JCR *jcr, FF_PKT *ff, int file_save(JCR *, FF_PKT *ff_pkt, bool)) bstrncat(ff->VerifyOpts, inc->VerifyOpts, sizeof(ff->VerifyOpts)); Dmsg1(100, "find_files: file=%s\n", inc->fname); if (!file_is_excluded(ff, inc->fname)) { - if (find_one_file(jcr, ff, file_save, inc->fname, inc->fname, (dev_t)-1, 1) ==0) { + if (find_one_file(jcr, ff, file_save, inc->fname, inc->fname, (dev_t)-1, true) ==0) { return 0; /* error return */ } } diff --git a/bacula/src/win32/makeall b/bacula/src/win32/makeall index 0a31ac5df..754efa25d 100755 --- a/bacula/src/win32/makeall +++ b/bacula/src/win32/makeall @@ -1,4 +1,7 @@ #!/bin/sh +# use option "bat=no" to disable BAT +# use option "winfiled" to only build the bacula-fd.exe without the installer +set -e make clean # Build win32 Bacula make bat=no -- 2.47.3