aboutsummaryrefslogtreecommitdiffstats
path: root/flist.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-11-09 21:37:04 -0800
committerWayne Davison <wayned@samba.org>2008-11-09 21:37:04 -0800
commit3ce3cabe346fed441b840102ec861483d64e126f (patch)
tree23a9f9ebc258f49a478478dd33a676505a9326f5 /flist.c
parent9411292489496984c8d5d9a446bf071afac3866d (diff)
downloadandroid_external_rsync-3ce3cabe346fed441b840102ec861483d64e126f.tar.gz
android_external_rsync-3ce3cabe346fed441b840102ec861483d64e126f.tar.bz2
android_external_rsync-3ce3cabe346fed441b840102ec861483d64e126f.zip
Fixed the use of a dot-dir path (foo/./bar) inside of a files-from file.
Diffstat (limited to 'flist.c')
-rw-r--r--flist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/flist.c b/flist.c
index cb667aa1..19936cab 100644
--- a/flist.c
+++ b/flist.c
@@ -2008,9 +2008,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
- if (!orig_dir)
- orig_dir = strdup(curr_dir);
-
if (relative_paths && protocol_version >= 30)
implied_dirs = 1; /* We send flagged implied dirs */
@@ -2036,6 +2033,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
use_ff_fd = 1;
}
+ if (!orig_dir)
+ orig_dir = strdup(curr_dir);
+
while (1) {
char fbuf[MAXPATHLEN], *fn, name_type;