Open config files in text mode when O_TEXT is defined. This helps on

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 4ea7e0b..0477a4c 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -26,7 +26,8 @@
 #define RSYNC_RSH_ENV "RSYNC_RSH"
 
 #define RSYNC_NAME "rsync"
-#define RSYNCD_CONF "/etc/rsyncd.conf"
+#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
+#define RSYNCD_USERCONF "rsyncd.conf"
 
 #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
 #define URL_PREFIX "rsync://"
@@ -330,6 +331,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #define INADDR_NONE 0xffffffff
 #endif
 
+#ifndef IN_LOOPBACKNET
+#define IN_LOOPBACKNET 127
+#endif
+
 struct file_struct {
        unsigned flags;
        time_t modtime;
@@ -590,6 +595,20 @@ void rsyserr(enum logcode, int, const char *, ...)
 #define inet_ntoa rep_inet_ntoa
 #endif
 
+/* Compatibility defines so that platforms that don't distinguish between
+ * text and binary files (like Cygwin does) can use the same code. */
+#ifndef O_TEXT
+#define O_TEXT 0
+#define O_TEXT_STR ""
+#else
+#define O_TEXT_STR "t"
+#endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#define O_BINARY_STR ""
+#else
+#define O_BINARY_STR "b"
+#endif
 
 #ifndef HAVE_STRLCPY
 size_t strlcpy(char *d, const char *s, size_t bufsize);
@@ -614,7 +633,7 @@ inet_ntop(int af, const void *src, char *dst, size_t size);
 #endif /* !HAVE_INET_NTOP */
 
 #ifndef HAVE_INET_PTON
-int isc_net_pton(int af, const char *src, void *dst);
+int inet_pton(int af, const char *src, void *dst);
 #endif
 
 #ifdef MAINTAINER_MODE
@@ -623,4 +642,4 @@ const char *get_panic_action(void);
 
 #define UNUSED(x) x __attribute__((__unused__))
 
-const char *io_write_phase, *io_read_phase;
+extern const char *io_write_phase, *io_read_phase;