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
close the other half of the pipe in do_recv(). This fixes the problem
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
e2d7745
..
187ef37
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-22,7
+22,6
@@
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
-#define RSYNCD_LOG "/var/adm/rsyncd.log"
#define BACKUP_SUFFIX "~"
#define BACKUP_SUFFIX "~"
@@
-52,8
+51,9
@@
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (4*1024*1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (4*1024*1024)
+#define IO_BUFFER_SIZE (4096)
-#define MAX_ARGS 100
+#define MAX_ARGS 100
0
#define BLOCKING_TIMEOUT 10
#define BLOCKING_TIMEOUT 10
@@
-73,6
+73,7
@@
#include <unistd.h>
#endif
#include <stdio.h>
#include <unistd.h>
#endif
#include <stdio.h>
+#include <stddef.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
@@
-170,6
+171,10
@@
#include "lib/getopt.h"
#endif
#include "lib/getopt.h"
#endif
+#ifdef HAVE_GLOB
+#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>
@@
-178,6
+183,8
@@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <syslog.h>
+#include <sys/file.h>
#ifndef S_IFLNK
#define S_IFLNK 0120000
#ifndef S_IFLNK
#define S_IFLNK 0120000
@@
-250,6
+257,10
@@
#define MAXPATHLEN 1024
#endif
#define MAXPATHLEN 1024
#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
struct file_struct {
unsigned flags;
time_t modtime;
struct file_struct {
unsigned flags;
time_t modtime;