X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffindlib%2Fcreate_file.c;h=4a512c4e992b8635fe71acc5184d2091ba55d467;hb=42867b26d894413176e71e518841400da7581217;hp=ab5b5e28b799bc4d79859007f224f0341af56012;hpb=9722201256126cef76e00f05883fbe5a030563e9;p=bacula%2Fbacula

diff --git a/bacula/src/findlib/create_file.c b/bacula/src/findlib/create_file.c
index ab5b5e28b7..4a512c4e99 100644
--- a/bacula/src/findlib/create_file.c
+++ b/bacula/src/findlib/create_file.c
@@ -1,14 +1,14 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -71,13 +71,14 @@ static int path_already_seen(JCR *jcr, char *path, int pnl);
  */
 int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
 {
-   int new_mode, parent_mode, mode;
+   mode_t new_mode, parent_mode, mode;
    uid_t uid;
    gid_t gid;
    int pnl;
    bool exists = false;
    struct stat mstatp;
 
+   bfd->reparse_point = false;
    if (is_win32_stream(attr->data_stream)) {
       set_win32_backup(bfd);
    } else {
@@ -159,7 +160,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          if (unlink(attr->ofname) == -1) {
             berrno be;
             Qmsg(jcr, M_ERROR, 0, _("File %s already exists and could not be replaced. ERR=%s.\n"),
-               attr->ofname, be.strerror());
+               attr->ofname, be.bstrerror());
             /* Continue despite error */
          }
       }
@@ -190,7 +191,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
              * execute bit set (i.e. parent_mode), and preserve what already
              * exists. Normally, this should do nothing.
              */
-            if (make_path(jcr, attr->ofname, parent_mode, parent_mode, uid, gid, 1, NULL) != 0) {
+            if (!makepath(attr, attr->ofname, parent_mode, parent_mode, uid, gid, 1)) {
                Dmsg1(10, "Could not make path. %s\n", attr->ofname);
                attr->ofname[pnl] = savechr;     /* restore full name */
                return CF_ERROR;
@@ -203,12 +204,11 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
       switch(attr->type) {
       case FT_REGE:
       case FT_REG:
-         Dmsg1(100, "Create file %s\n", attr->ofname);
+         Dmsg1(100, "Create=%s\n", attr->ofname);
          mode =  O_WRONLY | O_CREAT | O_TRUNC | O_BINARY; /*  O_NOFOLLOW; */
          if (IS_CTG(attr->statp.st_mode)) {
             mode |= O_CTG;               /* set contiguous bit if needed */
          }
-         Dmsg1(50, "Create file: %s\n", attr->ofname);
          if (is_bopen(bfd)) {
             Qmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid);
             bclose(bfd);
@@ -219,7 +219,8 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             berrno be;
             be.set_errno(bfd->berrno);
             Qmsg2(jcr, M_ERROR, 0, _("Could not create %s: ERR=%s\n"),
-                  attr->ofname, be.strerror());
+                  attr->ofname, be.bstrerror());
+            Dmsg2(100,"Could not create %s: ERR=%s\n", attr->ofname, be.bstrerror());
             return CF_ERROR;
          }
          return CF_EXTRACT;
@@ -233,7 +234,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             if (mkfifo(attr->ofname, attr->statp.st_mode) != 0 && errno != EEXIST) {
                berrno be;
                Qmsg2(jcr, M_ERROR, 0, _("Cannot make fifo %s: ERR=%s\n"),
-                     attr->ofname, be.strerror());
+                     attr->ofname, be.bstrerror());
                return CF_ERROR;
             }
          } else if (S_ISSOCK(attr->statp.st_mode)) {
@@ -251,7 +252,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             if (mknod(attr->ofname, attr->statp.st_mode, attr->statp.st_rdev) != 0 && errno != EEXIST) {
                berrno be;
                Qmsg2(jcr, M_ERROR, 0, _("Cannot make node %s: ERR=%s\n"),
-                     attr->ofname, be.strerror());
+                     attr->ofname, be.bstrerror());
                return CF_ERROR;
             }
          }
@@ -268,7 +269,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             /* Timeout open() in 60 seconds */
             if (attr->type == FT_FIFO) {
                Dmsg0(400, "Set FIFO timer\n");
-               tid = start_thread_timer(pthread_self(), 60);
+               tid = start_thread_timer(jcr, pthread_self(), 60);
             } else {
                tid = NULL;
             }
@@ -280,8 +281,8 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                berrno be;
                be.set_errno(bfd->berrno);
                Qmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
-                     attr->ofname, be.strerror());
-               Dmsg2(400, "Could not open %s: ERR=%s\n", attr->ofname, be.strerror());
+                     attr->ofname, be.bstrerror());
+               Dmsg2(400, "Could not open %s: ERR=%s\n", attr->ofname, be.bstrerror());
                stop_thread_timer(tid);
                return CF_ERROR;
             }
@@ -296,7 +297,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          if (symlink(attr->olname, attr->ofname) != 0 && errno != EEXIST) {
             berrno be;
             Qmsg3(jcr, M_ERROR, 0, _("Could not symlink %s -> %s: ERR=%s\n"),
-                  attr->ofname, attr->olname, be.strerror());
+                  attr->ofname, attr->olname, be.bstrerror());
             return CF_ERROR;
          }
          return CF_CREATED;
@@ -321,26 +322,28 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
                      /* restore original file flags even when linking failed */
                      if (chflags(attr->olname, s.st_flags) < 0) {
                         Qmsg2(jcr, M_ERROR, 0, _("Could not restore file flags for file %s: ERR=%s\n"),
-                              attr->olname, be.strerror());
+                              attr->olname, be.bstrerror());
                      }
 #endif /* HAVE_CHFLAGS */
             Qmsg3(jcr, M_ERROR, 0, _("Could not hard link %s -> %s: ERR=%s\n"),
-                  attr->ofname, attr->olname, be.strerror());
+                  attr->ofname, attr->olname, be.bstrerror());
+            Dmsg3(200, "Could not hard link %s -> %s: ERR=%s\n",
+                  attr->ofname, attr->olname, be.bstrerror());
             return CF_ERROR;
 #ifdef HAVE_CHFLAGS
                   }
                   /* finally restore original file flags */
                   if (chflags(attr->olname, s.st_flags) < 0) {
                      Qmsg2(jcr, M_ERROR, 0, _("Could not restore file flags for file %s: ERR=%s\n"),
-                            attr->olname, be.strerror());
+                            attr->olname, be.bstrerror());
                   }
                } else {
                  Qmsg2(jcr, M_ERROR, 0, _("Could not reset file flags for file %s: ERR=%s\n"),
-                       attr->olname, be.strerror());
+                       attr->olname, be.bstrerror());
                }
             } else {
               Qmsg3(jcr, M_ERROR, 0, _("Could not hard link %s -> %s: ERR=%s\n"),
-                    attr->ofname, attr->olname, be.strerror());
+                    attr->ofname, attr->olname, be.bstrerror());
               return CF_ERROR;
             }
 #endif /* HAVE_CHFLAGS */
@@ -350,10 +353,13 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
 #endif
       } /* End inner switch */
 
+   case FT_REPARSE:
+      bfd->reparse_point = true;
+      /* Fall through wanted */
    case FT_DIRBEGIN:
    case FT_DIREND:
       Dmsg2(200, "Make dir mode=%o dir=%s\n", new_mode, attr->ofname);
-      if (make_path(jcr, attr->ofname, new_mode, parent_mode, uid, gid, 0, NULL) != 0) {
+      if (!makepath(attr, attr->ofname, new_mode, parent_mode, uid, gid, 0)) {
          return CF_ERROR;
       }
       /*
@@ -377,7 +383,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
             }
 #endif
             Qmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"),
-                  attr->ofname, be.strerror());
+                  attr->ofname, be.bstrerror());
             return CF_ERROR;
          }
          return CF_EXTRACT;
@@ -385,6 +391,9 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace)
          return CF_CREATED;
       }
 
+   case FT_DELETED:
+      Qmsg2(jcr, M_INFO, 0, _("Original file %s have been deleted: type=%d\n"), attr->fname, attr->type);
+      break;
    /* The following should not occur */
    case FT_NOACCESS:
    case FT_NOFOLLOW: