X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1b85e3f1a0792a9799c96123a15c1ec75f3be7ce..1f1fbe187e2727566e84598f1d94412799c18653:/flist.c diff --git a/flist.c b/flist.c index 922db461..169c33fe 100644 --- a/flist.c +++ b/flist.c @@ -61,8 +61,6 @@ extern int sanitize_paths; extern int read_batch; extern int write_batch; -static char topsrcname[MAXPATHLEN]; - static struct exclude_struct **local_exclude_list; static struct file_struct null_file; @@ -221,8 +219,11 @@ int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf) if (l == -1) return -1; linkbuf[l] = 0; - if (copy_unsafe_links && (topsrcname[0] != '\0') && - unsafe_symlink(linkbuf, topsrcname)) { + if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { + if (verbose > 1) { + rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", + path, linkbuf); + } return do_stat(path, buffer); } } @@ -895,7 +896,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } for (i = 0; i < argc; i++) { - char *fname = topsrcname; + char fname2[MAXPATHLEN]; + char *fname = fname2; strlcpy(fname, argv[i], MAXPATHLEN); @@ -1000,8 +1002,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } } - topsrcname[0] = '\0'; - if (f != -1) { send_file_entry(NULL, f, 0); } @@ -1197,7 +1197,7 @@ void free_file(struct file_struct *file) /* * allocate a new file list */ -struct file_list *flist_new() +struct file_list *flist_new(void) { struct file_list *flist;