diff options
| author | Wayne Davison <wayned@samba.org> | 2006-04-17 19:53:41 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-04-17 19:53:41 +0000 |
| commit | 398612ba07574d84e51380513c7c3424ac84eef0 (patch) | |
| tree | 702983f041aa09a9724e27f48fc455e4c1d8f8e9 | |
| parent | 77b013afb500d94c278c31c9f0c6d2314da54ab7 (diff) | |
| download | rsync-398612ba07574d84e51380513c7c3424ac84eef0.tar.gz | |
Fixed a bug where special files were not getting hard-linked via
the --link-dest option.
| -rw-r--r-- | generator.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/generator.c b/generator.c index 518f49ea..40159f91 100644 --- a/generator.c +++ b/generator.c @@ -703,27 +703,32 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, int itemizing, int maybe_ATTRS_REPORT, enum logcode code) { - char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN]; + char fnamebuf[MAXPATHLEN]; STRUCT_STAT st; - int len, i = 0; + int i = 0; do { pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname); if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode) || !unchanged_attrs(file, &st)) continue; +#ifdef CAN_HARDLINK_SYMLINK if (S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS + char lnk[MAXPATHLEN]; + int len; if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0) continue; lnk[len] = '\0'; if (strcmp(lnk, file->u.link) != 0) #endif continue; - } else { - if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev) - continue; - } + } else +#endif + if (IS_DEVICE(st.st_mode) != IS_DEVICE(file->mode) + || IS_SPECIAL(st.st_mode) != IS_SPECIAL(file->mode) + || st.st_rdev != file->u.rdev) + continue; if (link_dest) { if (do_link(fnamebuf, fname) < 0) { rsyserr(FERROR, errno, |