new devel_bacula + fixes to conio/console

[bacula/bacula] / bacula / src / findlib / find.c

diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c
index edd6e9e4ef3c1d23e6553cb2e50a8d33f9450153..9a52dbd4c461d1b925e59ea44d303a5091bd8eb5 100644 (file)
--- a/bacula/src/findlib/find.c
+++ b/bacula/src/findlib/find.c
@@ -29,8 +29,8 @@
 #include "find.h"
 
 
-size_t name_max;              /* filename max length */
-size_t path_max;              /* path name max length */
+int32_t name_max;             /* filename max length */
+int32_t path_max;             /* path name max length */
 
 
 /* ****FIXME**** debug until stable */
@@ -105,15 +105,15 @@ set_find_options(FF_PKT *ff, int incremental, time_t save_time, int mtime_only)
 int
 find_files(JCR *jcr, FF_PKT *ff, int callback(FF_PKT *ff_pkt, void *hpkt), void *his_pkt) 
 {
-   char *file;
    struct s_included_file *inc = NULL;
 
    while (!job_canceled(jcr) && (inc = get_next_included_file(ff, inc))) {
-      file = inc->fname;
-      strcpy(ff->VerifyOpts, inc->VerifyOpts); /* Copy options for this file */
-      Dmsg1(50, "find_files: file=%s\n", file);
-      if (!file_is_excluded(ff, file)) {
-        if (!find_one_file(jcr, ff, callback, his_pkt, file, (dev_t)-1, 1)) {
+      /* Copy options for this file */
+      bstrncpy(ff->VerifyOpts, inc->VerifyOpts, sizeof(ff->VerifyOpts)); 
+      Dmsg1(50, "find_files: file=%s\n", inc->fname);
+      if (!file_is_excluded(ff, inc->fname)) {
+        if (!find_one_file(jcr, ff, callback, his_pkt, inc->fname, 
+             (dev_t)-1, 1)) {
            return 0;                  /* error return */
         }
       }