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
I like braces when multiple lines are indented.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
bec5c17
..
01398b5
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-1032,7
+1032,7
@@
static void list_file_entry(struct file_struct *f)
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %*s %s %s -> %s\n",
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %*s %s %s -> %s\n",
- permbuf, colwidth,
comma
_num(len),
+ permbuf, colwidth,
human
_num(len),
timestring(f->modtime), f_name(f, NULL),
F_SYMLINK(f));
} else
timestring(f->modtime), f_name(f, NULL),
F_SYMLINK(f));
} else
@@
-1043,7
+1043,7
@@
static void list_file_entry(struct file_struct *f)
f_name(f, NULL));
} else {
rprintf(FINFO, "%s %*s %s %s\n",
f_name(f, NULL));
} else {
rprintf(FINFO, "%s %*s %s %s\n",
- permbuf, colwidth,
comma
_num(len),
+ permbuf, colwidth,
human
_num(len),
timestring(f->modtime), f_name(f, NULL));
}
}
timestring(f->modtime), f_name(f, NULL));
}
}
@@
-1119,6
+1119,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
skip_dir = NULL;
}
skip_dir = NULL;
}
+ init_stat_x(&sx);
if (daemon_filter_list.head && (*fname != '.' || fname[1])) {
if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
if (is_dir < 0)
if (daemon_filter_list.head && (*fname != '.' || fname[1])) {
if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
if (is_dir < 0)
@@
-1136,7
+1137,6
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
}
}
}
- init_stat_x(&sx);
if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
parent_is_dry_missing:
if (fuzzy_dirlist) {
if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
parent_is_dry_missing:
if (fuzzy_dirlist) {
@@
-1354,10
+1354,11
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
const char *sl = F_SYMLINK(file);
if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (INFO_GTE(NAME, 1)) {
const char *sl = F_SYMLINK(file);
if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (INFO_GTE(NAME, 1)) {
- if (solo_file)
+ if (solo_file)
{
/* fname contains the destination path, but we
* want to report the source path. */
fname = f_name(file, NULL);
/* fname contains the destination path, but we
* want to report the source path. */
fname = f_name(file, NULL);
+ }
rprintf(FINFO,
"ignoring unsafe symlink \"%s\" -> \"%s\"\n",
fname, sl);
rprintf(FINFO,
"ignoring unsafe symlink \"%s\" -> \"%s\"\n",
fname, sl);