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
- Improved get_local_name() using ideas from Matt McCutchen's
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
bbbc05f
..
a4b9b0d
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-236,7
+236,7
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
}
if (verbose > 2)
}
if (verbose > 2)
- rprintf(FINFO, "delete_in_dir(%s)\n",
safe_fname(fbuf)
);
+ rprintf(FINFO, "delete_in_dir(%s)\n",
fbuf
);
if (allowed_lull)
maybe_send_keepalive();
if (allowed_lull)
maybe_send_keepalive();
@@
-281,7
+281,7
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
continue;
if (flist_find(flist, fp) < 0) {
int mode = fp->mode;
continue;
if (flist_find(flist, fp) < 0) {
int mode = fp->mode;
- f_name
_to
(fp, delbuf);
+ f_name(fp, delbuf);
delete_item(delbuf, mode, DEL_FORCE_RECURSE);
}
}
delete_item(delbuf, mode, DEL_FORCE_RECURSE);
}
}
@@
-306,9
+306,9
@@
static void do_delete_pass(struct file_list *flist)
if (!(file->flags & FLAG_DEL_HERE))
continue;
if (!(file->flags & FLAG_DEL_HERE))
continue;
- f_name
_to
(file, fbuf);
+ f_name(file, fbuf);
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
- rprintf(FINFO, "deleting in %s\n",
safe_fname(fbuf)
);
+ rprintf(FINFO, "deleting in %s\n",
fbuf
);
delete_in_dir(flist, fbuf, file);
}
delete_in_dir(flist, fbuf, file);
}
@@
-665,7
+665,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (verbose > 1 && maybe_PERMS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
if (verbose > 1 && maybe_PERMS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
- rprintf(code, "%s is uptodate\n",
safe_fname(fname)
);
+ rprintf(code, "%s is uptodate\n",
fname
);
}
return -2;
}
}
return -2;
}
@@
-676,7
+676,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (copy_file(cmpbuf, fname, file->mode) < 0) {
if (verbose) {
rsyserr(FINFO, errno, "copy_file %s => %s",
if (copy_file(cmpbuf, fname, file->mode) < 0) {
if (verbose) {
rsyserr(FINFO, errno, "copy_file %s => %s",
- full_fname(cmpbuf),
safe_fname(fname)
);
+ full_fname(cmpbuf),
fname
);
}
return -1;
}
}
return -1;
}
@@
-688,7
+688,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
- rprintf(code, "%s%s\n",
safe_fname(fname)
,
+ rprintf(code, "%s%s\n",
fname
,
match_level == 3 ? " is uptodate" : "");
}
if (preserve_hard_links && file->link_u.links)
match_level == 3 ? " is uptodate" : "");
}
if (preserve_hard_links && file->link_u.links)
@@
-742,7
+742,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
if (verbose > 1 && maybe_PERMS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
if (verbose > 1 && maybe_PERMS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
- rprintf(code, "%s is uptodate\n",
safe_fname(fname)
);
+ rprintf(code, "%s is uptodate\n",
fname
);
}
return -2;
} while (basis_dir[++i] != NULL);
}
return -2;
} while (basis_dir[++i] != NULL);
@@
-794,10
+794,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
- if (verbose > 2) {
- rprintf(FINFO, "recv_generator(%s,%d)\n",
- safe_fname(fname), ndx);
- }
+ if (verbose > 2)
+ rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
if (server_filter_list.head) {
if (excluded_below >= 0) {
if (server_filter_list.head) {
if (excluded_below >= 0) {
@@
-813,7
+811,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (verbose) {
rprintf(FINFO,
"skipping server-excluded file \"%s\"\n",
if (verbose) {
rprintf(FINFO,
"skipping server-excluded file \"%s\"\n",
-
safe_fname(fname)
);
+
fname
);
}
return;
}
}
return;
}
@@
-847,7
+845,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (verbose > 1) {
rprintf(FINFO, "not creating new %s \"%s\"\n",
S_ISDIR(file->mode) ? "directory" : "file",
if (verbose > 1) {
rprintf(FINFO, "not creating new %s \"%s\"\n",
S_ISDIR(file->mode) ? "directory" : "file",
-
safe_fname(fname)
);
+
fname
);
}
return;
}
}
return;
}
@@
-891,7
+889,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
}
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
- rprintf(code, "%s/\n",
safe_fname(fname)
);
+ rprintf(code, "%s/\n",
fname
);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
delete_in_dir(the_file_list, fname, file);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
delete_in_dir(the_file_list, fname, file);
@@
-908,11
+906,10
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
if (the_file_list->count == 1)
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
if (the_file_list->count == 1)
- fname = f_name(file);
+ fname = f_name(file
, NULL
);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname),
- safe_fname(file->u.link));
+ full_fname(fname), file->u.link);
}
return;
}
}
return;
}
@@
-963,7
+960,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
return;
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
- full_fname(fname),
safe_fname(file->u.link)
);
+ full_fname(fname),
file->u.link
);
} else {
set_perms(fname,file,NULL,0);
if (itemizing) {
} else {
set_perms(fname,file,NULL,0);
if (itemizing) {
@@
-971,8
+968,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
ITEM_LOCAL_CHANGE, 0, NULL);
}
if (code && verbose) {
- rprintf(code, "%s -> %s\n",
safe_fname(fname)
,
-
safe_fname(file->u.link)
);
+ rprintf(code, "%s -> %s\n",
fname
,
+
file->u.link
);
}
if (remove_sent_files && !dry_run) {
char numbuf[4];
}
if (remove_sent_files && !dry_run) {
char numbuf[4];
@@
-1011,7
+1008,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-
safe_fname(fname)
,
+
fname
,
(int)file->mode, (int)file->u.rdev);
}
if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
(int)file->mode, (int)file->u.rdev);
}
if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
@@
-1023,10
+1020,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
}
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
}
- if (code && verbose) {
- rprintf(code, "%s\n",
- safe_fname(fname));
- }
+ if (code && verbose)
+ rprintf(code, "%s\n", fname);
if (preserve_hard_links && file->link_u.links) {
hard_link_cluster(file, ndx,
itemizing, code);
if (preserve_hard_links && file->link_u.links) {
hard_link_cluster(file, ndx,
itemizing, code);
@@
-1044,41
+1039,38
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!S_ISREG(file->mode)) {
if (the_file_list->count == 1)
if (!S_ISREG(file->mode)) {
if (the_file_list->count == 1)
- fname = f_name(file);
- rprintf(FINFO, "skipping non-regular file \"%s\"\n",
- safe_fname(fname));
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
return;
}
if (max_size && file->length > max_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
return;
}
if (max_size && file->length > max_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
- fname = f_name(file);
- rprintf(FINFO, "%s is over max-size\n",
- safe_fname(fname));
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "%s is over max-size\n", fname);
}
return;
}
if (min_size && file->length < min_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
}
return;
}
if (min_size && file->length < min_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
- fname = f_name(file);
- rprintf(FINFO, "%s is under min-size\n",
- safe_fname(fname));
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "%s is under min-size\n", fname);
}
return;
}
if (ignore_existing && statret == 0) {
if (verbose > 1)
}
return;
}
if (ignore_existing && statret == 0) {
if (verbose > 1)
- rprintf(FINFO, "%s exists\n",
safe_fname(fname)
);
+ rprintf(FINFO, "%s exists\n",
fname
);
return;
}
if (update_only && statret == 0
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
return;
}
if (update_only && statret == 0
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
- rprintf(FINFO, "%s is newer\n",
safe_fname(fname)
);
+ rprintf(FINFO, "%s is newer\n",
fname
);
return;
}
return;
}
@@
-1119,10
+1111,10
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
int j = find_fuzzy(file, fuzzy_dirlist);
if (j >= 0) {
fuzzy_file = fuzzy_dirlist->files[j];
int j = find_fuzzy(file, fuzzy_dirlist);
if (j >= 0) {
fuzzy_file = fuzzy_dirlist->files[j];
- f_name
_to
(fuzzy_file, fnamecmpbuf);
+ f_name(fuzzy_file, fnamecmpbuf);
if (verbose > 2) {
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
if (verbose > 2) {
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
-
safe_fname(fname), safe_fname(fnamecmpbuf)
);
+
fname, fnamecmpbuf
);
}
st.st_size = fuzzy_file->length;
statret = 0;
}
st.st_size = fuzzy_file->length;
statret = 0;
@@
-1227,7
+1219,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (verbose > 3) {
rprintf(FINFO, "gen mapped %s of size %.0f\n",
if (verbose > 3) {
rprintf(FINFO, "gen mapped %s of size %.0f\n",
-
safe_fname(fnamecmp)
, (double)st.st_size);
+
fnamecmp
, (double)st.st_size);
}
if (verbose > 2)
}
if (verbose > 2)
@@
-1267,7
+1259,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
set_perms(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
set_perms(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
-
safe_fname(fname), safe_fname(backupptr)
);
+
fname, backupptr
);
}
free(back_file);
}
}
free(back_file);
}
@@
-1341,7
+1333,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
- f_name
_to
(file, fbuf);
+ f_name(file, fbuf);
recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
code, f_out);
recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
code, f_out);
@@
-1395,7
+1387,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
- f_name
_to
(file, fbuf);
+ f_name(file, fbuf);
recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
code, f_out);
}
recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
code, f_out);
}
@@
-1442,7
+1434,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
- recv_generator(f_name(file), file, i, itemizing,
+ recv_generator(f_name(file
, NULL
), file, i, itemizing,
maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();