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 RERR_LOG_FAILURE define.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
42b5e10
..
735173d
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-245,7
+245,8
@@
static int safe_read(int desc, char *ptr, size_t len)
/** Copy a file.
*
/** Copy a file.
*
- * This is used in conjunction with the --temp-dir and --backup options */
+ * This is used in conjunction with the --temp-dir, --backup, and
+ * --copy-dest options. */
int copy_file(char *source, char *dest, mode_t mode)
{
int ifd;
int copy_file(char *source, char *dest, mode_t mode)
{
int ifd;
@@
-891,7
+892,7
@@
const char *safe_fname(const char *fname)
ndx = (ndx + 1) % MAX_SAFE_NAMES;
for (t = fbuf[ndx]; *fname; fname++) {
ndx = (ndx + 1) % MAX_SAFE_NAMES;
for (t = fbuf[ndx]; *fname; fname++) {
- if (!isprint(*fname))
+ if (!isprint(*
(uchar*)
fname))
*t++ = '?';
else
*t++ = *fname;
*t++ = '?';
else
*t++ = *fname;
@@
-922,25
+923,21
@@
char *full_fname(const char *fn)
p1 = p2 = "";
else {
p1 = curr_dir;
p1 = p2 = "";
else {
p1 = curr_dir;
- p2 = "/";
+ for (p2 = p1; *p2 == '/'; p2++) {}
+ if (*p2)
+ p2 = "/";
}
if (module_id >= 0) {
m1 = " (in ";
m2 = lp_name(module_id);
m3 = ")";
}
if (module_id >= 0) {
m1 = " (in ";
m2 = lp_name(module_id);
m3 = ")";
- if (
*p1
) {
+ if (
p1 == curr_dir
) {
if (!lp_use_chroot(module_id)) {
char *p = lp_path(module_id);
if (*p != '/' || p[1])
p1 += strlen(p);
}
if (!lp_use_chroot(module_id)) {
char *p = lp_path(module_id);
if (*p != '/' || p[1])
p1 += strlen(p);
}
- if (!*p1)
- p2++;
- else
- p1++;
}
}
- else
- fn++;
} else
m1 = m2 = m3 = "";
} else
m1 = m2 = m3 = "";
@@
-1262,7
+1259,7
@@
const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
if (strcmp(s+1, "orig") == 0)
continue;
} else if (s_len > 2 && had_tilde
if (strcmp(s+1, "orig") == 0)
continue;
} else if (s_len > 2 && had_tilde
- && s[1] == '~' && isdigit(
s[2]
))
+ && s[1] == '~' && isdigit(
*(uchar*)(s+2)
))
continue;
*len_ptr = s_len;
suf = s;
continue;
*len_ptr = s_len;
suf = s;
@@
-1270,7
+1267,7
@@
const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr)
break;
/* Determine if the suffix is all digits. */
for (s++, s_len--; s_len > 0; s++, s_len--) {
break;
/* Determine if the suffix is all digits. */
for (s++, s_len--; s_len > 0; s++, s_len--) {
- if (!isdigit(*s))
+ if (!isdigit(*
(uchar*)
s))
return suf;
}
/* An all-digit suffix may not be that signficant. */
return suf;
}
/* An all-digit suffix may not be that signficant. */