X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffindlib%2Fcreate_file.c;h=5a4a92897c84a662b2b96f99e1d37e1c392b7d92;hb=545829877cc79cb3f484d64da16863b1147b2548;hp=8b20ff45598f47b03856dd7fffb89c5599a303f8;hpb=9e4e551c40ca986f86408d0f60ad8bac9bb9729f;p=bacula%2Fbacula diff --git a/bacula/src/findlib/create_file.c b/bacula/src/findlib/create_file.c index 8b20ff4559..5a4a92897c 100644 --- a/bacula/src/findlib/create_file.c +++ b/bacula/src/findlib/create_file.c @@ -1,22 +1,14 @@ -/* - * Create a file, and reset the modes - * - * Kern Sibbald, November MM - * - * Version $Id$ - * - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 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 @@ -33,6 +25,14 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * Create a file, and reset the modes + * + * Kern Sibbald, November MM + * + * Version $Id$ + * + */ #include "bacula.h" #include "find.h" @@ -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 { @@ -95,7 +96,7 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace) // eliminate invalid windows filename characters from foreign filenames char *ch = (char *)attr->ofname; if (ch[0] != 0 && ch[1] != 0) { - ch+=2; + ch += 2; while (*ch) { switch (*ch) { case ':': @@ -155,10 +156,11 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace) */ if (exists && attr->type != FT_RAW && attr->type != FT_FIFO) { /* Get rid of old copy */ + Dmsg1(400, "unlink %s\n", attr->ofname); 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 */ } } @@ -183,13 +185,13 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace) attr->ofname[pnl] = 0; /* terminate path */ if (!path_already_seen(jcr, attr->ofname, pnl)) { - Dmsg1(100, "Make path %s\n", attr->ofname); + Dmsg1(400, "Make path %s\n", attr->ofname); /* * If we need to make the directory, ensure that it is with * 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; @@ -218,7 +220,7 @@ 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()); return CF_ERROR; } return CF_EXTRACT; @@ -228,51 +230,66 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace) case FT_FIFO: /* Bacula fifo to save data */ case FT_SPEC: if (S_ISFIFO(attr->statp.st_mode)) { - Dmsg1(200, "Restore fifo: %s\n", attr->ofname); + Dmsg1(400, "Restore fifo: %s\n", attr->ofname); 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)) { + } else if (S_ISSOCK(attr->statp.st_mode)) { Dmsg1(200, "Skipping restore of socket: %s\n", attr->ofname); +#ifdef S_IFDOOR // Solaris high speed RPC mechanism + } else if (S_ISDOOR(attr->statp.st_mode)) { + Dmsg1(200, "Skipping restore of door file: %s\n", attr->ofname); +#endif +#ifdef S_IFPORT // Solaris event port for handling AIO + } else if (S_ISPORT(attr->statp.st_mode)) { + Dmsg1(200, "Skipping restore of event port file: %s\n", attr->ofname); +#endif } else { - Dmsg1(200, "Restore node: %s\n", attr->ofname); + Dmsg1(400, "Restore node: %s\n", attr->ofname); 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; } } + /* + * Here we are going to attempt to restore to a FIFO, which + * means that the FIFO must already exist, AND there must + * be some process already attempting to read from the + * FIFO, so we open it write-only. + */ if (attr->type == FT_RAW || attr->type == FT_FIFO) { btimer_t *tid; - Dmsg1(200, "FT_RAW|FT_FIFO %s\n", attr->ofname); + Dmsg1(400, "FT_RAW|FT_FIFO %s\n", attr->ofname); mode = O_WRONLY | O_BINARY; /* Timeout open() in 60 seconds */ if (attr->type == FT_FIFO) { - Dmsg0(200, "Set FIFO timer\n"); - tid = start_thread_timer(pthread_self(), 60); + Dmsg0(400, "Set FIFO timer\n"); + tid = start_thread_timer(jcr, pthread_self(), 60); } else { tid = NULL; } if (is_bopen(bfd)) { Qmsg1(jcr, M_ERROR, 0, _("bpkt already open fid=%d\n"), bfd->fid); } - Dmsg2(200, "open %s mode=0x%x\n", attr->ofname, mode); + Dmsg2(400, "open %s mode=0x%x\n", attr->ofname, mode); if ((bopen(bfd, attr->ofname, mode, 0)) < 0) { berrno be; be.set_errno(bfd->berrno); Qmsg2(jcr, M_ERROR, 0, _("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; } stop_thread_timer(tid); return CF_EXTRACT; } - Dmsg1(200, "FT_SPEC %s\n", attr->ofname); + Dmsg1(400, "FT_SPEC %s\n", attr->ofname); return CF_CREATED; case FT_LNK: @@ -280,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; @@ -289,18 +306,60 @@ int create_file(JCR *jcr, ATTR *attr, BFILE *bfd, int replace) Dmsg2(130, "Hard link %s => %s\n", attr->ofname, attr->olname); if (link(attr->olname, attr->ofname) != 0) { berrno be; +#ifdef HAVE_CHFLAGS + struct stat s; + + /* + * If using BSD user flags, maybe has a file flag + * preventing this. So attempt to disable, retry link, + * and reset flags. + * Note that BSD securelevel may prevent disabling flag. + */ + + if (stat(attr->olname, &s) == 0 && s.st_flags != 0) { + if (chflags(attr->olname, 0) == 0) { + if (link(attr->olname, attr->ofname) != 0) { + /* 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.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.bstrerror()); + } + } else { + Qmsg2(jcr, M_ERROR, 0, _("Could not reset file flags for file %s: ERR=%s\n"), + attr->olname, be.bstrerror()); + } + } else { + Qmsg3(jcr, M_ERROR, 0, _("Could not hard link %s -> %s: ERR=%s\n"), + attr->ofname, attr->olname, be.bstrerror()); + return CF_ERROR; + } +#endif /* HAVE_CHFLAGS */ + } return CF_CREATED; #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; } /* @@ -324,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; @@ -332,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: