-diff -Naur --exclude=qt-console --exclude=.svn --exclude='*~' bacula.org/src/dird/inc_conf.c bacula/src/dird/inc_conf.c
---- bacula.org/src/dird/inc_conf.c 2007-02-17 18:11:27.000000000 +0100
-+++ bacula/src/dird/inc_conf.c 2007-02-17 17:47:16.000000000 +0100
+diff -Naur bacula1/src/dird/inc_conf.c bacula2/src/dird/inc_conf.c
+--- bacula1/src/dird/inc_conf.c 2007-02-19 20:44:13.000000000 +0100
++++ bacula2/src/dird/inc_conf.c 2007-02-19 20:44:33.000000000 +0100
@@ -120,6 +120,7 @@
{"noatime", store_opts, {0}, 0, 0, 0},
{"enhancedwild", store_opts, {0}, 0, 0, 0},
{NULL, 0, 0}
};
-diff -Naur --exclude=qt-console --exclude=.svn --exclude='*~' bacula.org/src/filed/backup.c bacula/src/filed/backup.c
---- bacula.org/src/filed/backup.c 2007-02-17 18:11:28.000000000 +0100
-+++ bacula/src/filed/backup.c 2007-02-17 18:37:19.000000000 +0100
-@@ -454,6 +454,11 @@
+diff -Naur bacula1/src/filed/backup.c bacula2/src/filed/backup.c
+--- bacula1/src/filed/backup.c 2007-02-19 20:44:13.000000000 +0100
++++ bacula2/src/filed/backup.c 2007-02-19 20:47:14.000000000 +0100
+@@ -453,7 +453,13 @@
+ }
stat = send_data(jcr, data_stream, ff_pkt, digest, signing_digest);
- bclose(&ff_pkt->bfd);
+
+ if (ff_pkt->flags & FO_CHKCHANGES) {
-+ file_have_changed(jcr, ff_pkt);
++ has_file_changed(jcr, ff_pkt);
+ }
++
+ bclose(&ff_pkt->bfd);
+
if (!stat) {
return 0;
}
-diff -Naur --exclude=qt-console --exclude=.svn --exclude='*~' bacula.org/src/filed/job.c bacula/src/filed/job.c
---- bacula.org/src/filed/job.c 2007-02-17 18:11:28.000000000 +0100
-+++ bacula/src/filed/job.c 2007-02-17 18:37:19.000000000 +0100
+diff -Naur bacula1/src/filed/job.c bacula2/src/filed/job.c
+--- bacula1/src/filed/job.c 2007-02-19 20:44:13.000000000 +0100
++++ bacula2/src/filed/job.c 2007-02-19 20:44:33.000000000 +0100
@@ -1021,6 +1021,9 @@
case 'K':
fo->flags |= FO_NOATIME;
default:
Emsg1(M_ERROR, 0, _("Unknown include/exclude option: %c\n"), *p);
break;
-diff -Naur --exclude=qt-console --exclude=.svn --exclude='*~' bacula.org/src/findlib/find.h bacula/src/findlib/find.h
---- bacula.org/src/findlib/find.h 2007-02-17 18:11:57.000000000 +0100
-+++ bacula/src/findlib/find.h 2007-02-17 14:07:59.000000000 +0100
+diff -Naur bacula1/src/findlib/find.h bacula2/src/findlib/find.h
+--- bacula1/src/findlib/find.h 2007-02-19 20:44:16.000000000 +0100
++++ bacula2/src/findlib/find.h 2007-02-19 20:44:33.000000000 +0100
@@ -107,6 +107,7 @@
#define FO_ENCRYPT (1<<21) /* Encrypt data stream */
#define FO_NOATIME (1<<22) /* Use O_NOATIME to prevent atime change */
struct s_included_file {
struct s_included_file *next;
-diff -Naur --exclude=qt-console --exclude=.svn --exclude='*~' bacula.org/src/findlib/find_one.c bacula/src/findlib/find_one.c
---- bacula.org/src/findlib/find_one.c 2007-02-17 18:11:57.000000000 +0100
-+++ bacula/src/findlib/find_one.c 2007-02-17 18:08:37.000000000 +0100
-@@ -181,6 +181,51 @@
+diff -Naur bacula1/src/findlib/find_one.c bacula2/src/findlib/find_one.c
+--- bacula1/src/findlib/find_one.c 2007-02-19 20:44:16.000000000 +0100
++++ bacula2/src/findlib/find_one.c 2007-02-19 20:44:33.000000000 +0100
+@@ -271,6 +271,51 @@
return false;
}
+/* check if a file have changed during backup and display an error */
-+bool file_have_changed(JCR *jcr, FF_PKT *ff_pkt)
++bool has_file_changed(JCR *jcr, FF_PKT *ff_pkt)
+{
+ struct stat statp;
-+ Dmsg1(500, "file_have_changed fname=%s\n",ff_pkt->fname);
++ Dmsg1(500, "has_file_changed fname=%s\n",ff_pkt->fname);
+
+ if (ff_pkt->type != FT_REG) { /* not a regular file */
+ return false;
+ if (lstat(ff_pkt->fname, &statp) != 0) {
+ berrno be;
+ Jmsg(jcr, M_WARNING, 0,
-+ _("Can't check if %s have changed ERR=%s.\n"),ff_pkt->fname,be.strerror());
++ _("Cannot stat file %s: ERR=%s\n"),ff_pkt->fname,be.strerror());
+ return true;
+ }
+
+ if (statp.st_mtime != ff_pkt->statp.st_mtime) {
+ /* TODO: add time of changes */
-+ Jmsg(jcr, M_ERROR, 0, _("%s have changed during backup.\n"), ff_pkt->fname);
++ Jmsg(jcr, M_ERROR, 0, _("%s mtime changed during backup.\n"), ff_pkt->fname);
+ return true;
+ }
+
+ if (statp.st_ctime != ff_pkt->statp.st_ctime) {
+ /* TODO: add time of changes */
-+ Jmsg(jcr, M_ERROR, 0, _("%s have changed during backup.\n"), ff_pkt->fname);
++ Jmsg(jcr, M_ERROR, 0, _("%s ctime changed during backup.\n"), ff_pkt->fname);
+ return true;
+ }
+
+ if (statp.st_size != ff_pkt->statp.st_size) {
+ /* TODO: add size change */
-+ Jmsg(jcr, M_ERROR, 0, _("%s size have changed during backup.\n"),ff_pkt->fname);
++ Jmsg(jcr, M_ERROR, 0, _("%s size changed during backup.\n"),ff_pkt->fname);
+ return true;
+ }
+
+ if ((statp.st_blksize*statp.st_blocks) !=
+ (ff_pkt->statp.st_blksize*ff_pkt->statp.st_blocks)) {
+ /* TODO: add size change */
-+ Jmsg(jcr, M_ERROR, 0, _("%s size have changed during backup.\n"),ff_pkt->fname);
++ Jmsg(jcr, M_ERROR, 0, _("%s size changed during backup.\n"),ff_pkt->fname);
+ return true;
+ }
+
/*
* Find a single file.
* handle_file is the callback for handling the file.
-diff -Naur --exclude=qt-console --exclude=.svn --exclude='*~' bacula.org/src/findlib/protos.h bacula/src/findlib/protos.h
---- bacula.org/src/findlib/protos.h 2007-02-17 18:11:57.000000000 +0100
-+++ bacula/src/findlib/protos.h 2007-02-17 12:34:18.000000000 +0100
+diff -Naur bacula1/src/findlib/protos.h bacula2/src/findlib/protos.h
+--- bacula1/src/findlib/protos.h 2007-02-19 20:44:16.000000000 +0100
++++ bacula2/src/findlib/protos.h 2007-02-19 20:44:33.000000000 +0100
@@ -65,7 +65,7 @@
int handle_file(FF_PKT *ff_pkt, void *hpkt, bool top_level),
void *pkt, char *p, dev_t parent_device, bool top_level);
int term_find_one(FF_PKT *ff);
-
-+bool file_have_changed(JCR *jcr, FF_PKT *ff_pkt);
++bool has_file_changed(JCR *jcr, FF_PKT *ff_pkt);
/* From get_priv.c */
int enable_backup_privileges(JCR *jcr, int ignore_errors);
+diff -Naur bacula1/src/win32/dll/bacula.def bacula2/src/win32/dll/bacula.def
+--- bacula1/src/win32/dll/bacula.def 2007-02-28 14:35:43.000000000 +0100
++++ bacula2/src/win32/dll/bacula.def 2007-03-01 11:15:50.000000000 +0100
+@@ -80,6 +80,8 @@
+
+ ; find_one.c:
+ _Z13find_one_fileP3JCRP6FF_PKTPFiS2_PvbES3_Pcjb
++_Z17has_file_changedP3JCRP6FF_PKT
++
+
+ ; fstype.c:
+ _Z6fstypePKcPci
+
+