Add my_postgresql_max_length which caculates the maximum width for all values in...

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

diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c
index f95c6d3ce85612278c6c097826ede6893db8e761..ae7c984746d0bf0838c4f95dc3323f8a3530bfd5 100755 (executable)
--- a/bacula/src/findlib/find_one.c
+++ b/bacula/src/findlib/find_one.c
@@ -28,8 +28,8 @@
 #include "bacula.h"
 #include "find.h"
 
-extern size_t name_max;              /* filename max length */
-extern size_t path_max;              /* path name max length */
+extern int32_t name_max;             /* filename max length */
+extern int32_t path_max;             /* path name max length */
 
 /*
  * Structure for keeping track of hard linked files, we   
@@ -47,6 +47,14 @@ struct f_link {
     char name[1];                    /* The name */
 };
 
+static void free_dir_ff_pkt(FF_PKT *dir_ff_pkt)
+{
+   free(dir_ff_pkt->fname);
+   free(dir_ff_pkt->link);
+   free_pool_memory(dir_ff_pkt->sys_fname);
+   free(dir_ff_pkt);
+}
+
 /*
  * Find a single file.                       
  * handle_file is the callback for handling the file.
@@ -197,18 +205,23 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
       int status;
       dev_t our_device = ff_pkt->statp.st_dev;
 
-#ifndef HAVE_CYGWIN
-      if (access(fname, R_OK) == -1 && geteuid() != 0) {
-        /* Could not access() directory */
-        ff_pkt->type = FT_NOACCESS;
-        ff_pkt->ff_errno = errno;
-        rtn_stat = handle_file(ff_pkt, pkt);
-        if (ff_pkt->linked) {
-           ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+      /*  
+       * If we are using Win32 (non-portable) backup API, don't check
+       *  access as everything is more complicated, and
+       *  in principle, we should be able to access everything.
+       */
+      if (!have_win32_api() || (ff_pkt->flags & FO_PORTABLE)) {
+        if (access(fname, R_OK) == -1 && geteuid() != 0) {
+           /* Could not access() directory */
+           ff_pkt->type = FT_NOACCESS;
+           ff_pkt->ff_errno = errno;
+           rtn_stat = handle_file(ff_pkt, pkt);
+           if (ff_pkt->linked) {
+              ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+           }
+           return rtn_stat;
         }
-        return rtn_stat;
       }
-#endif
 
       /* Build a canonical directory name with a trailing slash in link var */
       len = strlen(fname);
@@ -230,11 +243,25 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
       } else {
         ff_pkt->type = FT_DIR;
       }
-      FF_PKT *dir_ff_pkt;
-      dir_ff_pkt = (FF_PKT *)bmalloc(sizeof(FF_PKT));
+
+      /*
+       * Create a temporary ff packet for this directory
+       *   entry, and defer handling the directory until
+       *   we have recursed into it.  This saves the
+       *   directory after all files have been processed, and
+       *   during the restore, the directory permissions will
+       *   be reset after all the files have been restored.
+       */
+      Dmsg1(300, "Create temp ff packet for dir: %s\n", ff_pkt->fname);
+      FF_PKT *dir_ff_pkt = (FF_PKT *)bmalloc(sizeof(FF_PKT));
       memcpy(dir_ff_pkt, ff_pkt, sizeof(FF_PKT));
       dir_ff_pkt->fname = bstrdup(ff_pkt->fname);
       dir_ff_pkt->link = bstrdup(ff_pkt->link);
+      dir_ff_pkt->sys_fname = get_pool_memory(PM_FNAME);
+      dir_ff_pkt->included_files_list = NULL;
+      dir_ff_pkt->excluded_files_list = NULL;
+      dir_ff_pkt->excluded_paths_list = NULL;
+      dir_ff_pkt->linklist = NULL;
        
       ff_pkt->link = ff_pkt->fname;     /* reset "link" */
 
@@ -250,9 +277,7 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
            ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
         }
         free(link);
-        free(dir_ff_pkt->fname);
-        free(dir_ff_pkt->link);
-        free(dir_ff_pkt);
+        free_dir_ff_pkt(dir_ff_pkt);
         return rtn_stat;
       }
 
@@ -269,13 +294,12 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
            ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
         }
         free(link);
-        free(dir_ff_pkt->fname);
-        free(dir_ff_pkt->link);
-        free(dir_ff_pkt);
+        free_dir_ff_pkt(dir_ff_pkt);
         return rtn_stat;
       }
       /* 
-       * Open directory for reading files within 
+       * Decend into or "recurse" into the directory to read
+       *   all the files in it.
        */
       errno = 0;
       if ((directory = opendir(fname)) == NULL) {
@@ -286,9 +310,7 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
            ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
         }
         free(link);
-        free(dir_ff_pkt->fname);
-        free(dir_ff_pkt->link);
-        free(dir_ff_pkt);
+        free_dir_ff_pkt(dir_ff_pkt);
         return rtn_stat;
       }
 
@@ -307,7 +329,7 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
         if (status != 0 || result == NULL) {
            break;
         }
-        ASSERT(name_max+1 > sizeof(struct dirent) + (int)NAMELEN(entry));
+        ASSERT(name_max+1 > (int)sizeof(struct dirent) + (int)NAMELEN(entry));
         p = entry->d_name;
          /* Skip `.', `..', and excluded file names.  */
          if (p[0] == '\0' || (p[0] == '.' && (p[1] == '\0' ||
@@ -346,9 +368,7 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
       if (ff_pkt->linked) {
         ff_pkt->linked->FileIndex = dir_ff_pkt->FileIndex;
       }
-      free(dir_ff_pkt->fname);
-      free(dir_ff_pkt->link);
-      free(dir_ff_pkt);
+      free_dir_ff_pkt(dir_ff_pkt);
 
       if (ff_pkt->atime_preserve) {
         utime(fname, &restore_times);
@@ -361,7 +381,18 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
     *  a block device, we do a raw backup of it or if it is
     *  a fifo, we simply read it.
     */
+#ifdef HAVE_FREEBSD_OS
+   /*
+    * On FreeBSD, all block devices are character devices, so
+    *  to be able to read a raw disk, we need the check for
+    *  a character device.
+    * crw-r-----  1 root  operator  - 116, 0x00040002 Jun  9 19:32 /dev/ad0s3
+    * crw-r-----  1 root  operator  - 116, 0x00040002 Jun  9 19:32 /dev/rad0s3
+    */
+   if (top_level && (S_ISBLK(ff_pkt->statp.st_mode) || S_ISCHR(ff_pkt->statp.st_mode))) {
+#else
    if (top_level && S_ISBLK(ff_pkt->statp.st_mode)) {
+#endif
       ff_pkt->type = FT_RAW;         /* raw partition */
    } else if (top_level && S_ISFIFO(ff_pkt->statp.st_mode) &&
              ff_pkt->flags & FO_READFIFO) {