/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 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.
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.
struct f_link *next;
dev_t dev; /* device */
ino_t ino; /* inode with device is unique */
- short linkcount;
uint32_t FileIndex; /* Bacula FileIndex of this file */
char name[1]; /* The name */
};
return false;
}
+/*
+ * check for BSD nodump flag
+ */
+static bool no_dump(JCR *jcr, FF_PKT *ff_pkt)
+{
+#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
+ if ( (ff_pkt->flags & FO_HONOR_NODUMP) &&
+ (ff_pkt->statp.st_flags & UF_NODUMP) ) {
+ Jmsg(jcr, M_INFO, 1, _(" NODUMP flag set - will not process %s\n"),
+ ff_pkt->fname);
+ return true; /* do not backup this file */
+ }
+#endif
+ return false; /* do backup */
+}
+
/* check if a file have changed during backup and display an error */
bool has_file_changed(JCR *jcr, FF_PKT *ff_pkt)
{
}
/*
- * In incremental/diffential or accurate backup, we
- * say if the current file has changed.
+ * For incremental/diffential or accurate backups, we
+ * determine if the current file has changed.
*/
static bool check_changes(JCR *jcr, FF_PKT *ff_pkt)
{
- /* in special mode (like accurate backup), user can
+ /* in special mode (like accurate backup), the programmer can
* choose his comparison function.
*/
if (ff_pkt->check_fct) {
return ff_pkt->check_fct(jcr, ff_pkt);
}
- /* in normal modes (incr/diff), we use this default
+ /* For normal backups (incr/diff), we use this default
* behaviour
*/
if (ff_pkt->incremental &&
return true;
}
+static bool have_ignoredir(FF_PKT *ff_pkt)
+{
+ struct stat sb;
+ char tmp_name[MAXPATHLEN];
+ char *ignoredir;
+
+ /* Ensure that pointers are defined */
+ if (!ff_pkt->fileset || !ff_pkt->fileset->incexe) {
+ return false;
+ }
+ ignoredir = ff_pkt->fileset->incexe->ignoredir;
+
+ if (ignoredir) {
+ if (strlen(ff_pkt->fname) + strlen(ignoredir) + 2 > MAXPATHLEN) {
+ return false;
+ }
+
+ strcpy(tmp_name, ff_pkt->fname);
+ strcat(tmp_name, "/");
+ strcat(tmp_name, ignoredir);
+ if (stat(tmp_name, &sb) == 0) {
+ Dmsg2(100, "Directory '%s' ignored (found %s)\n",
+ ff_pkt->fname, ignoredir);
+ return true; /* Just ignore this directory */
+ }
+ }
+ return false;
+}
+
/*
* Find a single file.
* handle_file is the callback for handling the file.
}
ff_pkt->volhas_attrlist = volume_has_attrlist(fname);
}
+
+ /*
+ * Ignore this entry if no_dump() returns true
+ */
+ if (no_dump(jcr, ff_pkt)) {
+ Dmsg1(100, "'%s' ignored (NODUMP flag set)\n",
+ ff_pkt->fname);
+ return 1;
+ }
+
/*
* If this is an Incremental backup, see if file was modified
* since our last "save_time", presumably the last Full save
* or Incremental.
*/
- if ( ff_pkt->incremental
- && !S_ISDIR(ff_pkt->statp.st_mode)
+ if ( !S_ISDIR(ff_pkt->statp.st_mode)
&& !check_changes(jcr, ff_pkt))
{
Dmsg1(500, "Non-directory incremental: %s\n", ff_pkt->fname);
lp->dev == (dev_t)ff_pkt->statp.st_dev) {
/* If we have already backed up the hard linked file don't do it again */
if (strcmp(lp->name, fname) == 0) {
+ Dmsg2(400, "== Name identical skip FI=%d file=%s\n", lp->FileIndex, fname);
return 1; /* ignore */
}
ff_pkt->link = lp->name;
ff_pkt->type = FT_LNKSAVED; /* Handle link, file already saved */
ff_pkt->LinkFI = lp->FileIndex;
- return handle_file(jcr, ff_pkt, top_level);
+ ff_pkt->linked = 0;
+ rtn_stat = handle_file(jcr, ff_pkt, top_level);
+ Dmsg3(400, "FT_LNKSAVED FI=%d LinkFI=%d file=%s\n",
+ ff_pkt->FileIndex, lp->FileIndex, lp->name);
+ return rtn_stat;
}
/* File not previously dumped. Chain it into our list. */
lp = (struct f_link *)bmalloc(sizeof(struct f_link) + len);
lp->ino = ff_pkt->statp.st_ino;
lp->dev = ff_pkt->statp.st_dev;
+ lp->FileIndex = 0; /* set later */
bstrncpy(lp->name, fname, len);
lp->next = ff_pkt->linkhash[linkhash];
ff_pkt->linkhash[linkhash] = lp;
ff_pkt->linked = lp; /* mark saved link */
+ Dmsg2(400, "added to hash FI=%d file=%s\n", ff_pkt->FileIndex, lp->name);
} else {
ff_pkt->linked = NULL;
}
if (ff_pkt->linked) {
ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
}
+ Dmsg3(400, "FT_REG FI=%d linked=%d file=%s\n", ff_pkt->FileIndex,
+ ff_pkt->linked ? 1 : 0, fname);
if (ff_pkt->flags & FO_KEEPATIME) {
utime(fname, &restore_times);
}
bool volhas_attrlist = ff_pkt->volhas_attrlist; /* Remember this if we recurse */
/*
- * 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.
+ * Ignore this directory and everything below if the file .nobackup
+ * (or what is defined for IgnoreDir in this fileset) exists
*/
- 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(jcr, ff_pkt, top_level);
- if (ff_pkt->linked) {
- ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
- }
- return rtn_stat;
- }
+ if (have_ignoredir(ff_pkt)) {
+ return 1; /* Just ignore this directory */
}
/* Build a canonical directory name with a trailing slash in link var */
link[len] = 0;
ff_pkt->link = link;
- if (ff_pkt->incremental && !check_changes(jcr, ff_pkt)) {
- /* Incremental option, directory entry not changed */
+ if (!check_changes(jcr, ff_pkt)) {
+ /* Incremental/Full+Base option, directory entry not changed */
ff_pkt->type = FT_DIRNOCHG;
} else {
ff_pkt->type = FT_DIRBEGIN;
* We have set st_rdev to 1 if it is a reparse point, otherwise 0,
* if st_rdev is 2, it is a mount point
*/
- if (have_win32_api() && ff_pkt->statp.st_rdev == 1) {
+#if defined(HAVE_WIN32)
+ if (ff_pkt->statp.st_rdev == WIN32_REPARSE_POINT) {
ff_pkt->type = FT_REPARSE;
}
+#endif
/*
* Note, we return the directory to the calling program (handle_file)
* when we first see the directory (FT_DIRBEGIN.
* to cross, or we may be restricted by a list of permitted
* file systems.
*/
+ bool is_win32_mount_point = false;
+#if defined(HAVE_WIN32)
+ is_win32_mount_point = ff_pkt->statp.st_rdev == WIN32_MOUNT_POINT;
+#endif
if (!top_level && ff_pkt->flags & FO_NO_RECURSION) {
ff_pkt->type = FT_NORECURSE;
recurse = false;
- } else if (!top_level && parent_device != ff_pkt->statp.st_dev) {
+ } else if (!top_level && (parent_device != ff_pkt->statp.st_dev ||
+ is_win32_mount_point)) {
if(!(ff_pkt->flags & FO_MULTIFS)) {
ff_pkt->type = FT_NOFSCHG;
recurse = false;
projects / bacula / bacula / blobdiff