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
Add note about possible hardlink bug.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
01d8ccd
..
689965d
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
@@
-463,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
@@
-563,19
+566,24
@@
extern int errno;
/* handler for null strings in printf format */
#define NS(s) ((s)?(s):"<NULL>")
/* handler for null strings in printf format */
#define NS(s) ((s)?(s):"<NULL>")
+#if !defined(__GNUC__) || defined(APPLE)
+/* Apparently the OS X port of gcc gags on __attribute__.
+ *
+ * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
+#define __attribute__(x)
+
+#endif
+
+
/* use magic gcc attributes to catch format errors */
void rprintf(enum logcode , const char *, ...)
/* use magic gcc attributes to catch format errors */
void rprintf(enum logcode , const char *, ...)
-#ifdef __GNUC__
- __attribute__ ((format (printf, 2, 3)))
-#endif
+ __attribute__((format (printf, 2, 3)))
;
/* This is just like rprintf, but it also tries to print some
* representation of the error code. Normally errcode = errno. */
void rsyserr(enum logcode, int, const char *, ...)
;
/* This is just like rprintf, but it also tries to print some
* representation of the error code. Normally errcode = errno. */
void rsyserr(enum logcode, int, const char *, ...)
-#ifdef __GNUC__
- __attribute__ ((format (printf, 3, 4)))
-#endif
+ __attribute__((format (printf, 3, 4)))
;
#ifdef REPLACE_INET_NTOA
;
#ifdef REPLACE_INET_NTOA
@@
-608,3
+616,5
@@
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
+
+#define UNUSED(x) x __attribute__((__unused__))