diff options
| author | Wayne Davison <wayned@samba.org> | 2009-09-02 08:53:40 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2009-09-02 08:53:40 -0700 |
| commit | 8e15bd87dddf044f29f21de5e52289b1796c2760 (patch) | |
| tree | d8c95884e5a179d360febbaac271c158d312cc83 /generator.c | |
| parent | 4a440e4be84ea63535bd918a4b103467118d1965 (diff) | |
| download | android_external_rsync-8e15bd87dddf044f29f21de5e52289b1796c2760.tar.gz android_external_rsync-8e15bd87dddf044f29f21de5e52289b1796c2760.tar.bz2 android_external_rsync-8e15bd87dddf044f29f21de5e52289b1796c2760.zip | |
Better compiling if SUPPORT_LINKS is not defined.
Diffstat (limited to 'generator.c')
| -rw-r--r-- | generator.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/generator.c b/generator.c index df2434f5..2aa07cd0 100644 --- a/generator.c +++ b/generator.c @@ -874,12 +874,15 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, char *cmpbuf, stat_x *sxp, int itemizing, enum logcode code) { - char lnk[MAXPATHLEN]; int best_match = -1; int match_level = 0; enum nonregtype type; uint32 *devp; - int len, j = 0; +#ifdef SUPPORT_LINKS + char lnk[MAXPATHLEN]; + int len; +#endif + int j = 0; #ifndef SUPPORT_LINKS if (S_ISLNK(file->mode)) @@ -919,11 +922,13 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, if (!IS_DEVICE(sxp->st.st_mode)) continue; break; -#ifdef SUPPORT_LINKS case TYPE_SYMLINK: +#ifdef SUPPORT_LINKS if (!S_ISLNK(sxp->st.st_mode)) continue; break; +#else + return -1; #endif } if (match_level < 1) { @@ -939,14 +944,16 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp))) continue; break; -#ifdef SUPPORT_LINKS case TYPE_SYMLINK: +#ifdef SUPPORT_LINKS if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0) continue; lnk[len] = '\0'; if (strcmp(lnk, F_SYMLINK(file)) != 0) continue; break; +#else + return -1; #endif } if (match_level < 2) { |