win32: typos & comments

diff --git a/bacula/src/filed/fd_snapshot.c b/bacula/src/filed/fd_snapshot.c
index b990f847c1f8016c177272b24dfe5a510eeee873..980b1c1b2b05a954bf54302bd48d8664a7dfbb4d 100644 (file)
--- 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 a9238b640b4a132021a66e820731136148f614f8..2bf988bd26e3b7f41288ae75494c71eb2732a36a 100644 (file)
--- 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 7bac944cef76c392816cedc2edd16de311432bfd..7f6116c31ed4911d99ea6c0b2c1b95eb0076c362 100644 (file)
--- 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 0a31ac5df95502fa0dbaf43e7b4f87188ba10cb6..754efa25d1667933ae7c383768f8752f2ec9ab8a 100755 (executable)
--- 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