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
A couple fixes in add_rule() for XFLG_ABS_IF_SLASH:
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
c6293d0
..
6be36d3
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-189,11
+189,14
@@
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
#define SIGNIFICANT_ITEM_FLAGS (~(\
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
-#define CFN_KEEP_
LEADING_DOT_DIR
(1<<0)
+#define CFN_KEEP_
DOT_DIRS
(1<<0)
#define CFN_KEEP_TRAILING_SLASH (1<<1)
#define CFN_DROP_TRAILING_DOT_DIR (1<<2)
#define CFN_COLLAPSE_DOT_DOT_DIRS (1<<3)
#define CFN_KEEP_TRAILING_SLASH (1<<1)
#define CFN_DROP_TRAILING_DOT_DIR (1<<2)
#define CFN_COLLAPSE_DOT_DOT_DIRS (1<<3)
+#define SP_DEFAULT 0
+#define SP_KEEP_DOT_DIRS (1<<0)
+
/* Log-message categories. FLOG only goes to the log file, not the client;
* FCLIENT is the opposite. */
enum logcode {
/* Log-message categories. FLOG only goes to the log file, not the client;
* FCLIENT is the opposite. */
enum logcode {
@@
-333,10
+336,6
@@
enum msgcode {
#endif
#endif
#endif
#endif
-#ifdef HAVE_GLOB_H
-#include <glob.h>
-#endif
-
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
@@
-1107,6
+1106,11
@@
size_t strlcat(char *d, const char *s, size_t bufsize);
#define MY_GID() getgid()
#endif
#define MY_GID() getgid()
#endif
+#ifdef FORCE_FD_ZERO_MEMSET
+#undef FD_ZERO
+#define FD_ZERO(fdsetp) memset(fdsetp, 0, sizeof (fd_set))
+#endif
+
extern int verbose;
#ifndef HAVE_INET_NTOP
extern int verbose;
#ifndef HAVE_INET_NTOP