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
An easy way to run all the commands in prepare-source.mak.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
dcc0799
..
396a1c8
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-117,8
+117,8
@@
#define XFLG_ANCHORED2ABS (1<<2)
#define XFLG_ABS_IF_SLASH (1<<3)
#define XFLG_ANCHORED2ABS (1<<2)
#define XFLG_ABS_IF_SLASH (1<<3)
-#define
PERM
S_REPORT (1<<0)
-#define
PERM
S_SKIP_MTIME (1<<1)
+#define
ATTR
S_REPORT (1<<0)
+#define
ATTR
S_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
@@
-158,14
+158,14
@@
/* Log-message categories. Only FERROR and FINFO get sent over the socket.
* FLOG and FCLIENT are only used on the daemon side for custom logging,
* while FNAME is only used on the client side. */
/* Log-message categories. Only FERROR and FINFO get sent over the socket.
* FLOG and FCLIENT are only used on the daemon side for custom logging,
* while FNAME is only used on the client side. */
-enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FNAME=5 };
+enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FNAME=5
, FSOCKERR=6
};
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
enum msgcode {
MSG_DATA=0, /* raw data on the multiplexed stream */
MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
enum msgcode {
MSG_DATA=0, /* raw data on the multiplexed stream */
MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
- MSG_LOG=FLOG,
/* sibling logging */
+ MSG_LOG=FLOG,
MSG_SOCKERR=FSOCKERR,
/* sibling logging */
MSG_REDO=9, /* reprocess indicated flist index */
MSG_SUCCESS=100,/* successfully updated indicated flist index */
MSG_DELETED=101,/* successfully deleted a file on receiving side */
MSG_REDO=9, /* reprocess indicated flist index */
MSG_SUCCESS=100,/* successfully updated indicated flist index */
MSG_DELETED=101,/* successfully deleted a file on receiving side */
@@
-493,11
+493,6
@@
struct hlink {
int hlindex;
};
int hlindex;
};
-struct id_pair {
- uid_t uid;
- gid_t gid;
-};
-
#define F_DEV link_u.idev->dev
#define F_INODE link_u.idev->inode
#define F_DEV link_u.idev->dev
#define F_INODE link_u.idev->inode
@@
-521,8
+516,9
@@
struct file_struct {
struct idev *idev;
struct hlink *links;
} link_u;
struct idev *idev;
struct hlink *links;
} link_u;
- struct id_pair *ids;
time_t modtime;
time_t modtime;
+ uid_t uid;
+ gid_t gid;
mode_t mode;
uchar flags; /* this item MUST remain last */
};
mode_t mode;
uchar flags; /* this item MUST remain last */
};
@@
-644,6
+640,7
@@
struct stats {
int current_file_index;
};
int current_file_index;
};
+struct chmod_mode_struct;
#include "byteorder.h"
#include "lib/mdfour.h"
#include "byteorder.h"
#include "lib/mdfour.h"
@@
-651,6
+648,15
@@
struct stats {
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
+#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
+
+#define UNUSED(x) x __attribute__((__unused__))
+
#include "proto.h"
/* We have replacement versions of these if they're missing. */
#include "proto.h"
/* We have replacement versions of these if they're missing. */
@@
-694,7
+700,12
@@
extern int errno;
#define SUPPORT_HARD_LINKS 1
#endif
#define SUPPORT_HARD_LINKS 1
#endif
-#define SIGNAL_CAST (RETSIGTYPE (*)())
+#ifdef HAVE_SIGACTION
+#define SIGACTION(n,h) sigact.sa_handler=(h), sigaction((n),&sigact,NULL)
+#define signal(n,h) we_need_to_call_SIGACTION_not_signal(n,h)
+#else
+#define SIGACTION(n,h) signal(n,h)
+#endif
#ifndef EWOULDBLOCK
#define EWOULDBLOCK EAGAIN
#ifndef EWOULDBLOCK
#define EWOULDBLOCK EAGAIN
@@
-791,7
+802,8
@@
extern int errno;
#define INADDR_NONE 0xffffffff
#endif
#define INADDR_NONE 0xffffffff
#endif
-#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
+#define IS_SPECIAL(mode) (S_ISSOCK(mode) || S_ISFIFO(mode))
+#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
/* Initial mask on permissions given to temporary files. Mask off setuid
bits and group access because of potential race-condition security
/* Initial mask on permissions given to temporary files. Mask off setuid
bits and group access because of potential race-condition security
@@
-801,14
+813,6
@@
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
-
/* Convenient wrappers for malloc and realloc. Use them. */
#define new(type) ((type *)malloc(sizeof(type)))
#define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
/* Convenient wrappers for malloc and realloc. Use them. */
#define new(type) ((type *)malloc(sizeof(type)))
#define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
@@
-873,7
+877,3
@@
int inet_pton(int af, const char *src, void *dst);
#ifdef MAINTAINER_MODE
const char *get_panic_action(void);
#endif
#ifdef MAINTAINER_MODE
const char *get_panic_action(void);
#endif
-
-#define UNUSED(x) x __attribute__((__unused__))
-
-extern const char *io_write_phase, *io_read_phase;