Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Added a sleep to make sure that the preservation of the mtime on
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
6bc831c
..
8fe4744
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-516,16
+516,16
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
strlcpy(c, fname, MAXPATHLEN);
} else
c = f_name(file, NULL);
strlcpy(c, fname, MAXPATHLEN);
} else
c = f_name(file, NULL);
- if (am_sender &&
file->dir.root
) {
+ if (am_sender &&
F_ROOTDIR(file)
) {
pathjoin(buf2, sizeof buf2,
pathjoin(buf2, sizeof buf2,
-
file->dir.root
, c);
+
F_ROOTDIR(file)
, c);
clean_fname(buf2, 0);
if (fmt[1]) {
strlcpy(c, buf2, MAXPATHLEN);
n = c;
} else
n = buf2;
clean_fname(buf2, 0);
if (fmt[1]) {
strlcpy(c, buf2, MAXPATHLEN);
n = c;
} else
n = buf2;
- } else if (*c != '/') {
+ } else if (
am_daemon &&
*c != '/') {
pathjoin(buf2, sizeof buf2,
curr_dir + module_dirlen, c);
clean_fname(buf2, 0);
pathjoin(buf2, sizeof buf2,
curr_dir + module_dirlen, c);
clean_fname(buf2, 0);
@@
-744,9
+744,8
@@
void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
void log_delete(const char *fname, int mode)
{
static struct {
void log_delete(const char *fname, int mode)
{
static struct {
- union f
list
_extras ex[4]; /* just in case... */
+ union f
ile
_extras ex[4]; /* just in case... */
struct file_struct file;
struct file_struct file;
- char basename[1];
} x;
int len = strlen(fname);
const char *fmt;
} x;
int len = strlen(fname);
const char *fmt;