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
Batch files need to be written with the new subprotocol value
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
2355214
..
a2da787
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-3,12
+3,11
@@
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003
, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2003
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,7
+36,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 in_exit_cleanup;
+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;
@@
-91,14
+91,6
@@
struct {
{ 0, NULL }
};
{ 0, NULL }
};
-#define EXIT_OR_RETURN(err) \
- do { \
- if (in_exit_cleanup) \
- return; \
- exit_cleanup(err); \
- } while (0)
-
-
/*
* Map from rsync error code to name, or return NULL.
*/
/*
* Map from rsync error code to name, or return NULL.
*/
@@
-112,7
+104,7
@@
static char const *rerr_name(int code)
return NULL;
}
return NULL;
}
-static void logit(int priority, char *buf)
+static void logit(int priority, c
onst c
har *buf)
{
if (logfile_was_closed)
logfile_reopen();
{
if (logfile_was_closed)
logfile_reopen();
@@
-223,32
+215,32
@@
static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
for (s = buf; s < end; s++) {
if ((s < end - 4
&& *s == '\\' && s[1] == '#'
for (s = buf; s < end; s++) {
if ((s < end - 4
&& *s == '\\' && s[1] == '#'
- && is
digit(*(uchar*)(s+2)
)
- && is
digit(*(uchar*)(s+3)
)
- && is
digit(*(uchar*)(s+4)
))
+ && is
Digit(s + 2
)
+ && is
Digit(s + 3
)
+ && is
Digit(s + 4
))
|| (*s != '\t'
|| (*s != '\t'
- && ((use_isprint && !is
print(*(uchar*)
s))
+ && ((use_isprint && !is
Print(
s))
|| *(uchar*)s < ' '))) {
if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
|| *(uchar*)s < ' '))) {
if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
-
EXIT_OR_RETURN
(RERR_MESSAGEIO);
+
exit_cleanup
(RERR_MESSAGEIO);
fprintf(f, "\\#%03o", *(uchar*)s);
buf = s + 1;
}
}
if (buf != end && fwrite(buf, end - buf, 1, f) != 1)
fprintf(f, "\\#%03o", *(uchar*)s);
buf = s + 1;
}
}
if (buf != end && fwrite(buf, end - buf, 1, f) != 1)
-
EXIT_OR_RETURN
(RERR_MESSAGEIO);
+
exit_cleanup
(RERR_MESSAGEIO);
}
/* this is the underlying (unformatted) rsync debugging function. Call
* it with FINFO, FERROR or FLOG. Note: recursion can happen with
* certain fatal conditions. */
}
/* this is the underlying (unformatted) rsync debugging function. Call
* it with FINFO, FERROR or FLOG. Note: recursion can happen with
* certain fatal conditions. */
-void rwrite(enum logcode code, char *buf, int len)
+void rwrite(enum logcode code, c
onst c
har *buf, int len)
{
int trailing_CR_or_NL;
FILE *f = NULL;
if (len < 0)
{
int trailing_CR_or_NL;
FILE *f = NULL;
if (len < 0)
-
EXIT_OR_RETURN
(RERR_MESSAGEIO);
+
exit_cleanup
(RERR_MESSAGEIO);
if (am_server && msg_fd_out >= 0) {
/* Pass the message to our sibling. */
if (am_server && msg_fd_out >= 0) {
/* Pass the message to our sibling. */
@@
-302,21
+294,25
@@
void rwrite(enum logcode code, char *buf, int len)
f = am_server ? stderr : stdout;
break;
default:
f = am_server ? stderr : stdout;
break;
default:
-
EXIT_OR_RETURN
(RERR_MESSAGEIO);
+
exit_cleanup
(RERR_MESSAGEIO);
}
trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
? buf[--len] : 0;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
}
trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
? buf[--len] : 0;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#ifndef ICONV_CONST
+#define ICONV_CONST
+#endif
if (ic_chck != (iconv_t)-1) {
char convbuf[1024];
if (ic_chck != (iconv_t)-1) {
char convbuf[1024];
- char *in_buf = buf, *out_buf = convbuf;
+ ICONV_CONST char *in_buf = (ICONV_CONST char *)buf;
+ char *out_buf = convbuf;
size_t in_cnt = len, out_cnt = sizeof convbuf - 1;
iconv(ic_chck, NULL, 0, NULL, 0);
while (iconv(ic_chck, &in_buf,&in_cnt,
size_t in_cnt = len, out_cnt = sizeof convbuf - 1;
iconv(ic_chck, NULL, 0, NULL, 0);
while (iconv(ic_chck, &in_buf,&in_cnt,
-
&out_buf,&out_cnt) == (size_t)-1) {
+ &out_buf,&out_cnt) == (size_t)-1) {
if (out_buf != convbuf) {
filtered_fwrite(f, convbuf, out_buf - convbuf, 0);
out_buf = convbuf;
if (out_buf != convbuf) {
filtered_fwrite(f, convbuf, out_buf - convbuf, 0);
out_buf = convbuf;
@@
-394,7
+390,7
@@
void rsyserr(enum logcode code, int errcode, const char *format, ...)
char buf[BIGPATHBUFLEN];
size_t len;
char buf[BIGPATHBUFLEN];
size_t len;
- str
cpy(buf, RSYNC_NAME ": "
);
+ str
lcpy(buf, RSYNC_NAME ": ", sizeof buf
);
len = (sizeof RSYNC_NAME ": ") - 1;
va_start(ap, format);
len = (sizeof RSYNC_NAME ": ") - 1;
va_start(ap, format);
@@
-406,7
+402,7
@@
void rsyserr(enum logcode code, int errcode, const char *format, ...)
": %s (%d)\n", strerror(errcode), errcode);
}
if (len >= sizeof buf)
": %s (%d)\n", strerror(errcode), errcode);
}
if (len >= sizeof buf)
-
EXIT_OR_RETURN
(RERR_MESSAGEIO);
+
exit_cleanup
(RERR_MESSAGEIO);
rwrite(code, buf, len);
}
rwrite(code, buf, len);
}
@@
-427,12
+423,14
@@
void rflush(enum logcode code)
}
/* A generic logging routine for send/recv, with parameter substitiution. */
}
/* A generic logging routine for send/recv, with parameter substitiution. */
-static void log_formatted(enum logcode code, char *format, char *op,
- struct file_struct *file, struct stats *initial_stats,
- int iflags, char *hlink)
+static void log_formatted(enum logcode code, const char *format, const char *op,
+ 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 buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32];
- char *p, *s, *n;
+ char *p, *s, *c;
+ const char *n;
size_t len, total;
int64 b;
size_t len, total;
int64 b;
@@
-444,21
+442,21
@@
static void log_formatted(enum logcode code, char *format, char *op,
total = strlcpy(buf, format, sizeof buf);
if (total > MAXPATHLEN) {
rprintf(FERROR, "log-format string is WAY too long!\n");
total = strlcpy(buf, format, sizeof buf);
if (total > MAXPATHLEN) {
rprintf(FERROR, "log-format string is WAY too long!\n");
-
EXIT_OR_RETURN
(RERR_MESSAGEIO);
+
exit_cleanup
(RERR_MESSAGEIO);
}
buf[total++] = '\n';
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
s = p++;
}
buf[total++] = '\n';
buf[total] = '\0';
for (p = buf; (p = strchr(p, '%')) != NULL; ) {
s = p++;
-
n
= fmt + 1;
+
c
= fmt + 1;
if (*p == '-')
if (*p == '-')
- *
n
++ = *p++;
- while (is
digit(*(uchar*)p) && n
- fmt < (int)(sizeof fmt) - 8)
- *
n
++ = *p++;
+ *
c
++ = *p++;
+ while (is
Digit(p) && c
- fmt < (int)(sizeof fmt) - 8)
+ *
c
++ = *p++;
if (!*p)
break;
if (!*p)
break;
- *
n
= '\0';
+ *
c
= '\0';
n = NULL;
switch (*p) {
n = NULL;
switch (*p) {
@@
-473,22
+471,22
@@
static void log_formatted(enum logcode code, char *format, 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;
@@
-499,60
+497,71
@@
static void log_formatted(enum logcode code, char *format, char *op,
n = buf2;
break;
case 'M':
n = buf2;
break;
case 'M':
- n = timestring(file->modtime);
- {
- char *cp = n;
- while ((cp = strchr(cp, ' ')) != NULL)
- *cp = '-';
- }
+ n = c = timestring(file->modtime);
+ while ((c = strchr(p, ' ')) != NULL)
+ *c = '-';
break;
case 'B':
break;
case 'B':
- n = buf2 + MAXPATHLEN - PERMSTRING_SIZE;
- permstring(n - 1, file->mode); /* skip the type char */
+ c = buf2 + MAXPATHLEN - PERMSTRING_SIZE - 1;
+ permstring(c, file->mode);
+ n = c + 1; /* skip the type char */
break;
case 'o':
n = op;
break;
case 'f':
break;
case 'o':
n = op;
break;
case 'f':
- n = f_name(file, NULL);
- if (am_sender && file->dir.root) {
+ if (fname) {
+ c = f_name_buf();
+ strlcpy(c, fname, MAXPATHLEN);
+ } else
+ c = f_name(file, NULL);
+ if (am_sender && F_ROOTDIR(file)) {
pathjoin(buf2, sizeof buf2,
pathjoin(buf2, sizeof buf2,
-
file->dir.root, n
);
+
F_ROOTDIR(file), c
);
clean_fname(buf2, 0);
clean_fname(buf2, 0);
- if (fmt[1])
- strlcpy(n, buf2, MAXPATHLEN);
- else
+ if (fmt[1]) {
+ strlcpy(c, buf2, MAXPATHLEN);
+ n = c;
+ } else
n = buf2;
n = buf2;
- } else if (
*n
!= '/') {
+ } else if (
am_daemon && *c
!= '/') {
pathjoin(buf2, sizeof buf2,
pathjoin(buf2, sizeof buf2,
- curr_dir + module_dirlen,
n
);
+ curr_dir + module_dirlen,
c
);
clean_fname(buf2, 0);
clean_fname(buf2, 0);
- if (fmt[1])
- strlcpy(n, buf2, MAXPATHLEN);
- else
+ if (fmt[1]) {
+ strlcpy(c, buf2, MAXPATHLEN);
+ n = c;
+ } else
n = buf2;
n = buf2;
- } else
- clean_fname(n, 0);
+ } else {
+ clean_fname(c, 0);
+ n = c;
+ }
if (*n == '/')
n++;
break;
case 'n':
if (*n == '/')
n++;
break;
case 'n':
- n = 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))
if (S_ISDIR(file->mode))
- strlcat(n, "/", MAXPATHLEN);
+ strlcat(c, "/", MAXPATHLEN);
+ n = c;
break;
case 'L':
if (hlink && *hlink) {
n = hlink;
break;
case 'L':
if (hlink && *hlink) {
n = hlink;
- str
cpy(buf2, " => "
);
- } else if (S_ISLNK(file->mode) &&
file->u.link
) {
- n =
file->u.link
;
- str
cpy(buf2, " -> "
);
+ str
lcpy(buf2, " => ", sizeof buf2
);
+ } else if (S_ISLNK(file->mode) &&
!fname
) {
+ n =
F_SYMLINK(file)
;
+ str
lcpy(buf2, " -> ", sizeof buf2
);
} else {
n = "";
if (!fmt[1])
break;
} else {
n = "";
if (!fmt[1])
break;
- str
cpy(buf2, " "
);
+ str
lcpy(buf2, " ", sizeof buf2
);
}
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n);
}
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n);
@@
-599,40
+608,41
@@
static void log_formatted(enum logcode code, char *format, char *op,
n = "*deleting";
break;
}
n = "*deleting";
break;
}
- n = buf2 + MAXPATHLEN - 32;
-
n
[0] = iflags & ITEM_LOCAL_CHANGE
+ n
= c
= buf2 + MAXPATHLEN - 32;
+
c
[0] = iflags & ITEM_LOCAL_CHANGE
? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
: !(iflags & ITEM_TRANSFER) ? '.'
: !local_server && *op == 's' ? '<' : '>';
? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
: !(iflags & ITEM_TRANSFER) ? '.'
: !local_server && *op == 's' ? '<' : '>';
-
n
[1] = S_ISDIR(file->mode) ? 'd'
+
c
[1] = S_ISDIR(file->mode) ? 'd'
: IS_SPECIAL(file->mode) ? 'S'
: IS_DEVICE(file->mode) ? 'D'
: S_ISLNK(file->mode) ? 'L' : 'f';
: IS_SPECIAL(file->mode) ? 'S'
: IS_DEVICE(file->mode) ? 'D'
: S_ISLNK(file->mode) ? 'L' : 'f';
-
n
[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
-
n
[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
-
n
[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
+
c
[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
+
c
[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
+
c
[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
: !preserve_times || S_ISLNK(file->mode) ? 'T' : 't';
: !preserve_times || S_ISLNK(file->mode) ? 'T' : 't';
- n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
- n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
- n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
- n[8] = '.';
- n[9] = '\0';
+ c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+ c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+ c[11] = '\0';
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
char ch = iflags & ITEM_IS_NEW ? '+' : '?';
int i;
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
char ch = iflags & ITEM_IS_NEW ? '+' : '?';
int i;
- for (i = 2; n[i]; i++)
- n[i] = ch;
- } else if (n[0] == '.' || n[0] == 'h'
- || (n[0] == 'c' && n[1] == 'f')) {
+ for (i = 2; c[i]; i++)
+ c[i] = ch;
+ } else if (c[0] == '.' || c[0] == 'h' || c[0] == 'c') {
int i;
int i;
- for (i = 2;
n
[i]; i++) {
- if (
n
[i] != '.')
+ for (i = 2;
c
[i]; i++) {
+ if (
c
[i] != '.')
break;
}
break;
}
- if (!
n
[i]) {
- for (i = 2;
n
[i]; i++)
-
n
[i] = ' ';
+ if (!
c
[i]) {
+ for (i = 2;
c
[i]; i++)
+
c
[i] = ' ';
}
}
break;
}
}
break;
@@
-686,7
+696,7
@@
int log_format_has(const char *format, char esc)
for (p = format; (p = strchr(p, '%')) != NULL; ) {
if (*++p == '-')
p++;
for (p = format; (p = strchr(p, '%')) != NULL; ) {
if (*++p == '-')
p++;
- while (is
digit(*(uchar*)
p))
+ while (is
Digit(
p))
p++;
if (!*p)
break;
p++;
if (!*p)
break;
@@
-700,22
+710,22
@@
int log_format_has(const char *format, char esc)
* to stdout. If it is FLOG, it just goes to the log file. Otherwise we
* output to both. */
void log_item(enum logcode code, struct file_struct *file,
* to stdout. If it is FLOG, it just goes to the log file. Otherwise we
* output to both. */
void log_item(enum logcode code, struct file_struct *file,
- struct stats *initial_stats, int iflags, char *hlink)
+ struct stats *initial_stats, int iflags, c
onst c
har *hlink)
{
{
- char *s_or_r = am_sender ? "send" : "recv";
+ c
onst c
har *s_or_r = am_sender ? "send" : "recv";
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);
}
}
void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
}
}
void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
- char *buf)
+ c
onst c
har *buf)
{
int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
int see_item = itemizing && (significant_flags || *buf
{
int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
int see_item = itemizing && (significant_flags || *buf
@@
-732,14
+742,16
@@
void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
}
}
}
}
-void log_delete(char *fname, int mode)
+void log_delete(c
onst c
har *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);
int len = strlen(fname);
- char *fmt;
+ c
onst c
har *fmt;
- file.mode = mode;
- file.basename = fname;
+ x.file.mode = mode;
if (!verbose && !stdout_format)
;
if (!verbose && !stdout_format)
;
@@
-749,7
+761,7
@@
void log_delete(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);
}
@@
-757,7
+769,7
@@
void log_delete(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);
}
/*
}
/*