Mention that --keep-dirlinks can be dangerous if there are

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 731528f..79ec384 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -134,8 +134,6 @@ void setup_iconv(void)
 # endif
 }
 
-# ifdef ICONV_OPTION
-
 /* This function converts the characters in the "in" xbuf into characters
  * in the "out" xbuf.  The "len" of the "in" xbuf is used starting from its
  * "pos".  The "size" of the "out" xbuf restricts how many characters can be
@@ -205,7 +203,6 @@ int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags)
 
        return errno ? -1 : 0;
 }
-# endif
 #endif
 
 int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
@@ -401,9 +398,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
        change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
                  && sxp->st.st_gid != (gid_t)F_GROUP(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
-       if (S_ISLNK(sxp->st.st_mode))
+       if (S_ISLNK(sxp->st.st_mode)) {
                ;
-       else
+       } else
 #endif
        if (change_uid || change_gid) {
                if (verbose > 2) {