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
Changed the static file_struct var to match the changes in rsync.h.
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
9e34ffd
..
fedeacd
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-37,6
+37,8
@@
extern int msg_fd_out;
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
+extern int preserve_uid;
+extern int preserve_gid;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
@@
-423,8
+425,9
@@
void rflush(enum logcode code)
/* A generic logging routine for send/recv, with parameter substitiution. */
static void log_formatted(enum logcode code, const char *format, const char *op,
/* A generic logging routine for send/recv, with parameter substitiution. */
static void log_formatted(enum logcode code, const char *format, const char *op,
- struct file_struct *file, struct stats *initial_stats,
- int iflags, const char *hlink)
+ struct file_struct *file, const char *fname,
+ struct stats *initial_stats, int iflags,
+ const char *hlink)
{
char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32];
char *p, *s, *c;
{
char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32];
char *p, *s, *c;
@@
-469,22
+472,22
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
case 'l':
strlcat(fmt, ".0f", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
case 'l':
strlcat(fmt, ".0f", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
- (double)
file->length
);
+ (double)
F_LENGTH(file)
);
n = buf2;
break;
case 'U':
strlcat(fmt, "ld", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
n = buf2;
break;
case 'U':
strlcat(fmt, "ld", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
-
(long)file->uid
);
+
preserve_uid ? (long)F_UID(file) : 0
);
n = buf2;
break;
case 'G':
n = buf2;
break;
case 'G':
- if (
file->gid
== GID_NONE)
+ if (
!preserve_gid || F_GID(file)
== GID_NONE)
n = "DEFAULT";
else {
strlcat(fmt, "ld", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
n = "DEFAULT";
else {
strlcat(fmt, "ld", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
- (long)
file->gid
);
+ (long)
F_GID(file)
);
n = buf2;
}
break;
n = buf2;
}
break;
@@
-508,7
+511,11
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
n = op;
break;
case 'f':
n = op;
break;
case 'f':
- c = f_name(file, NULL);
+ if (fname) {
+ c = f_name_buf();
+ strlcpy(c, fname, MAXPATHLEN);
+ } else
+ c = f_name(file, NULL);
if (am_sender && file->dir.root) {
pathjoin(buf2, sizeof buf2,
file->dir.root, c);
if (am_sender && file->dir.root) {
pathjoin(buf2, sizeof buf2,
file->dir.root, c);
@@
-535,7
+542,11
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
n++;
break;
case 'n':
n++;
break;
case 'n':
- c = f_name(file, NULL);
+ if (fname) {
+ c = f_name_buf();
+ strlcpy(c, fname, MAXPATHLEN);
+ } else
+ c = f_name(file, NULL);
if (S_ISDIR(file->mode))
strlcat(c, "/", MAXPATHLEN);
n = c;
if (S_ISDIR(file->mode))
strlcat(c, "/", MAXPATHLEN);
n = c;
@@
-544,8
+555,8
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
if (hlink && *hlink) {
n = hlink;
strlcpy(buf2, " => ", sizeof buf2);
if (hlink && *hlink) {
n = hlink;
strlcpy(buf2, " => ", sizeof buf2);
- } else if (S_ISLNK(file->mode) &&
file->u.link
) {
- n =
file->u.link
;
+ } else if (S_ISLNK(file->mode) &&
!fname
) {
+ n =
F_SYMLINK(file)
;
strlcpy(buf2, " -> ", sizeof buf2);
} else {
n = "";
strlcpy(buf2, " -> ", sizeof buf2);
} else {
n = "";
@@
-704,11
+715,11
@@
void log_item(enum logcode code, struct file_struct *file,
if (code != FLOG && stdout_format && !am_server) {
log_formatted(FCLIENT, stdout_format, s_or_r,
if (code != FLOG && stdout_format && !am_server) {
log_formatted(FCLIENT, stdout_format, s_or_r,
- file, initial_stats, iflags, hlink);
+ file,
NULL,
initial_stats, iflags, hlink);
}
if (code != FCLIENT && logfile_format && *logfile_format) {
log_formatted(FLOG, logfile_format, s_or_r,
}
if (code != FCLIENT && logfile_format && *logfile_format) {
log_formatted(FLOG, logfile_format, s_or_r,
- file, initial_stats, iflags, hlink);
+ file,
NULL,
initial_stats, iflags, hlink);
}
}
}
}
@@
-732,12
+743,14
@@
void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
void log_delete(const char *fname, int mode)
{
void log_delete(const char *fname, int mode)
{
- static struct file_struct file;
+ static struct {
+ union file_extras ex[4]; /* just in case... */
+ struct file_struct file;
+ } x;
int len = strlen(fname);
const char *fmt;
int len = strlen(fname);
const char *fmt;
- file.mode = mode;
- file.basename = fname;
+ x.file.mode = mode;
if (!verbose && !stdout_format)
;
if (!verbose && !stdout_format)
;
@@
-747,7
+760,7
@@
void log_delete(const char *fname, int mode)
send_msg(MSG_DELETED, fname, len);
} else {
fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n";
send_msg(MSG_DELETED, fname, len);
} else {
fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n";
- log_formatted(FCLIENT, fmt, "del.", &
fil
e, &stats,
+ log_formatted(FCLIENT, fmt, "del.", &
x.file, fnam
e, &stats,
ITEM_DELETED, NULL);
}
ITEM_DELETED, NULL);
}
@@
-755,7
+768,7
@@
void log_delete(const char *fname, int mode)
return;
fmt = logfile_format_has_o_or_i ? logfile_format : "deleting %n";
return;
fmt = logfile_format_has_o_or_i ? logfile_format : "deleting %n";
- log_formatted(FLOG, fmt, "del.", &
fil
e, &stats, ITEM_DELETED, NULL);
+ log_formatted(FLOG, fmt, "del.", &
x.file, fnam
e, &stats, ITEM_DELETED, NULL);
}
/*
}
/*
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff