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
Doc permissions while testing.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
14a0995
..
6eacbcf
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-85,11
+85,9
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#include "config.h"
#include "config.h"
-#if HAVE_REMSH
-#define RSYNC_RSH "remsh"
-#else
-#define RSYNC_RSH "rsh"
-#endif
+/* The default RSYNC_RSH is always set in config.h, either to "remsh",
+ * "rsh", or otherwise something specified by the user. HAVE_REMSH
+ * controls parameter munging for HP/UX, etc. */
#include <sys/types.h>
#include <sys/types.h>
@@
-219,6
+217,8
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#include <compat.h>
#endif
#include <compat.h>
#endif
+#include <assert.h>
+
#define BOOL int
#define BOOL int
@@
-298,6
+298,10
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
* major/minor, and transfer the two parts as 32-bit ints. That gives
* you somewhat more of a chance that they'll come from a big machine
* to a little one in a useful way.
* major/minor, and transfer the two parts as 32-bit ints. That gives
* you somewhat more of a chance that they'll come from a big machine
* to a little one in a useful way.
+ *
+ * FIXME: Really we need an unsigned type, and we perhaps ought to
+ * cope with platforms on which this is an unsigned int or even a
+ * struct. Later.
*/
#define INO64_T int64
#define DEV64_T int64
*/
#define INO64_T int64
#define DEV64_T int64
@@
-418,11
+422,12
@@
static inline int flist_up(struct file_list *flist, int i)
}
#include "byteorder.h"
}
#include "byteorder.h"
-#include "proto.h"
#include "lib/mdfour.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "lib/mdfour.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
+#include "proto.h"
+
/* We have replacement versions of these if they're missing. */
#ifndef HAVE_ASPRINTF
int asprintf(char **ptr, const char *format, ...);
/* We have replacement versions of these if they're missing. */
#ifndef HAVE_ASPRINTF
int asprintf(char **ptr, const char *format, ...);
@@
-458,6
+463,9
@@
extern int errno;
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
+/* This could be bad on systems which have no lchown and where chown
+ * follows symbollic links. On such systems it might be better not to
+ * try to chown symlinks at all. */
#ifndef HAVE_LCHOWN
#define lchown chown
#endif
#ifndef HAVE_LCHOWN
#define lchown chown
#endif
@@
-603,3
+611,9
@@
inet_ntop(int af, const void *src, char *dst, size_t size);
#ifndef HAVE_INET_PTON
int isc_net_pton(int af, const char *src, void *dst);
#endif
#ifndef HAVE_INET_PTON
int isc_net_pton(int af, const char *src, void *dst);
#endif
+
+#ifdef __GNUC__
+# define UNUSED(x) x __attribute__((__unused__))
+#else
+# define UNUSED(x) x
+#endif /* ndef __GNUC__ */