Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made the description of ignored symlink errors more accurate.
[rsync/rsync.git]
/
tls.c
diff --git
a/tls.c
b/tls.c
index
cadacdc
..
c52b25a
100644
(file)
--- a/
tls.c
+++ b/
tls.c
@@
-2,7
+2,7
@@
* Trivial ls for comparing two directories after running an rsync.
*
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
* Trivial ls for comparing two directories after running an rsync.
*
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-200
7
Wayne Davison
+ * Copyright (C) 2003-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-46,6
+46,7
@@
int am_root = 0;
int read_only = 1;
int list_only = 0;
int preserve_perms = 0;
int read_only = 1;
int list_only = 0;
int preserve_perms = 0;
+int preserve_executability = 0;
#ifdef SUPPORT_XATTRS
#ifdef SUPPORT_XATTRS
@@
-89,7
+90,12
@@
static int stat_xattr(const char *fname, STRUCT_STAT *fst)
exit(1);
}
exit(1);
}
- fst->st_mode = from_wire_mode(mode);
+#if _S_IFLNK != 0120000
+ if ((mode & (_S_IFMT)) == 0120000)
+ mode = (mode & ~(_S_IFMT)) | _S_IFLNK;
+#endif
+ fst->st_mode = mode;
+
fst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
fst->st_uid = uid;
fst->st_gid = gid;
fst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
fst->st_uid = uid;
fst->st_gid = gid;