extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
-extern int in_exit_cleanup;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
{ 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.
*/
return NULL;
}
-static void logit(int priority, char *buf)
+static void logit(int priority, const char *buf)
{
if (logfile_was_closed)
logfile_reopen();
for (s = buf; s < end; s++) {
if ((s < end - 4
&& *s == '\\' && s[1] == '#'
- && isdigit(*(uchar*)(s+2))
- && isdigit(*(uchar*)(s+3))
- && isdigit(*(uchar*)(s+4)))
+ && isDigit(s + 2)
+ && isDigit(s + 3)
+ && isDigit(s + 4))
|| (*s != '\t'
- && ((use_isprint && !isprint(*(uchar*)s))
+ && ((use_isprint && !isPrint(s))
|| *(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)
- 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. */
-void rwrite(enum logcode code, char *buf, int len)
+void rwrite(enum logcode code, const char *buf, int len)
{
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. */
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')
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
if (ic_chck != (iconv_t)-1) {
char convbuf[1024];
- char *in_buf = buf, *out_buf = convbuf;
+ const char *in_buf = buf;
+ char *out_buf = convbuf;
size_t in_cnt = len, out_cnt = sizeof convbuf - 1;
iconv(ic_chck, NULL, 0, NULL, 0);
char buf[BIGPATHBUFLEN];
size_t len;
- strcpy(buf, RSYNC_NAME ": ");
+ strlcpy(buf, RSYNC_NAME ": ", sizeof buf);
len = (sizeof RSYNC_NAME ": ") - 1;
va_start(ap, format);
": %s (%d)\n", strerror(errcode), errcode);
}
if (len >= sizeof buf)
- EXIT_OR_RETURN(RERR_MESSAGEIO);
+ exit_cleanup(RERR_MESSAGEIO);
rwrite(code, buf, len);
}
}
/* A generic logging routine for send/recv, with parameter substitiution. */
-static void log_formatted(enum logcode code, char *format, char *op,
+static void log_formatted(enum logcode code, const char *format, const char *op,
struct file_struct *file, struct stats *initial_stats,
- int iflags, char *hlink)
+ int iflags, const char *hlink)
{
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;
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++;
- n = fmt + 1;
+ c = fmt + 1;
if (*p == '-')
- *n++ = *p++;
- while (isdigit(*(uchar*)p) && n - fmt < (int)(sizeof fmt) - 8)
- *n++ = *p++;
+ *c++ = *p++;
+ while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8)
+ *c++ = *p++;
if (!*p)
break;
- *n = '\0';
+ *c = '\0';
n = NULL;
switch (*p) {
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':
- 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':
- n = f_name(file, NULL);
+ c = f_name(file, NULL);
if (am_sender && file->dir.root) {
pathjoin(buf2, sizeof buf2,
- file->dir.root, n);
+ file->dir.root, c);
clean_fname(buf2, 0);
- if (fmt[1])
- strlcpy(n, buf2, MAXPATHLEN);
- else
+ if (fmt[1]) {
+ strlcpy(c, buf2, MAXPATHLEN);
+ n = c;
+ } else
n = buf2;
- } else if (*n != '/') {
+ } else if (*c != '/') {
pathjoin(buf2, sizeof buf2,
- curr_dir + module_dirlen, n);
+ curr_dir + module_dirlen, c);
clean_fname(buf2, 0);
- if (fmt[1])
- strlcpy(n, buf2, MAXPATHLEN);
- else
+ if (fmt[1]) {
+ strlcpy(c, buf2, MAXPATHLEN);
+ n = c;
+ } else
n = buf2;
- } else
- clean_fname(n, 0);
+ } else {
+ clean_fname(c, 0);
+ n = c;
+ }
if (*n == '/')
n++;
break;
case 'n':
- n = f_name(file, NULL);
+ c = f_name(file, NULL);
if (S_ISDIR(file->mode))
- strlcat(n, "/", MAXPATHLEN);
+ strlcat(c, "/", MAXPATHLEN);
+ n = c;
break;
case 'L':
if (hlink && *hlink) {
n = hlink;
- strcpy(buf2, " => ");
+ strlcpy(buf2, " => ", sizeof buf2);
} else if (S_ISLNK(file->mode) && file->u.link) {
n = file->u.link;
- strcpy(buf2, " -> ");
+ strlcpy(buf2, " -> ", sizeof buf2);
} else {
n = "";
if (!fmt[1])
break;
- strcpy(buf2, " ");
+ strlcpy(buf2, " ", sizeof buf2);
}
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n);
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' ? '<' : '>';
- 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';
- 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';
- 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] = '.';
+ c[9] = '\0';
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;
- for (i = 2; n[i]; i++) {
- if (n[i] != '.')
+ for (i = 2; c[i]; i++) {
+ if (c[i] != '.')
break;
}
- if (!n[i]) {
- for (i = 2; n[i]; i++)
- n[i] = ' ';
+ if (!c[i]) {
+ for (i = 2; c[i]; i++)
+ c[i] = ' ';
}
}
break;
rprintf(FERROR,
"buffer overflow expanding %%%c -- exiting\n",
p[0]);
- EXIT_OR_RETURN(RERR_MESSAGEIO);
+ exit_cleanup(RERR_MESSAGEIO);
}
/* Shuffle the rest of the string along to make space for n */
for (p = format; (p = strchr(p, '%')) != NULL; ) {
if (*++p == '-')
p++;
- while (isdigit(*(uchar*)p))
+ while (isDigit(p))
p++;
if (!*p)
break;
* 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, const char *hlink)
{
- char *s_or_r = am_sender ? "send" : "recv";
+ const char *s_or_r = am_sender ? "send" : "recv";
if (code != FLOG && stdout_format && !am_server) {
log_formatted(FCLIENT, stdout_format, s_or_r,
}
void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
- char *buf)
+ const char *buf)
{
int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
int see_item = itemizing && (significant_flags || *buf
}
}
-void log_delete(char *fname, int mode)
+void log_delete(const char *fname, int mode)
{
static struct file_struct file;
int len = strlen(fname);
- char *fmt;
+ const char *fmt;
file.mode = mode;
file.basename = fname;