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
Move the initialization of push_dir, which calls getcwd, to early in main.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
e11b84a
..
d24cdf7
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-23,6
+23,7
@@
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
+#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define URL_PREFIX "rsync://"
#define BACKUP_SUFFIX "~"
#define URL_PREFIX "rsync://"
#define BACKUP_SUFFIX "~"
@@
-52,7
+53,7
@@
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
-#define MAX_MAP_SIZE (
1*1024
*1024)
+#define MAX_MAP_SIZE (
256
*1024)
#define IO_BUFFER_SIZE (4092)
#define MAX_READ_BUFFER (1024*1024)
#define IO_BUFFER_SIZE (4092)
#define MAX_READ_BUFFER (1024*1024)
@@
-148,11
+149,6
@@
#endif
#include <errno.h>
#endif
#include <errno.h>
-#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
-#include <sys/mman.h>
-#define USE_MMAP 1
-#endif
-
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
@@
-303,6
+299,7
@@
struct file_struct {
char *sum;
};
char *sum;
};
+
struct file_list {
int count;
int malloced;
struct file_list {
int count;
int malloced;
@@
-326,9
+323,9
@@
struct sum_struct {
};
struct map_struct {
};
struct map_struct {
- char *
map,*
p;
+ char *p;
int fd,p_size,p_len;
int fd,p_size,p_len;
- OFF_T
size, p
_offset;
+ OFF_T
file_size, p_offset, p_fd
_offset;
};
struct exclude_struct {
};
struct exclude_struct {
@@
-474,3
+471,14
@@
extern int errno;
#ifdef REPLACE_INET_NTOA
#define inet_ntoa rep_inet_ntoa
#endif
#ifdef REPLACE_INET_NTOA
#define inet_ntoa rep_inet_ntoa
#endif
+
+
+#ifndef HAVE_STRLCPY
+size_t strlcpy(char *d, const char *s, size_t bufsize);
+#endif
+
+#ifndef HAVE_STRLCAT
+size_t strlcat(char *d, const char *s, size_t bufsize);
+#endif
+
+#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)