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
Changed sig_int() to use a standard signal-handler prototype.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
1712b2c
..
b6038f7
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-58,12
+58,12
@@
/* These flags are used in the live flist data. */
#define FLAG_TOP_DIR (1<<0)
/* These flags are used in the live flist data. */
#define FLAG_TOP_DIR (1<<0)
+#define FLAG_SENT (1<<1) /* sender */
#define FLAG_HLINK_EOL (1<<1) /* receiver/generator */
#define FLAG_HLINK_EOL (1<<1) /* receiver/generator */
-#define FLAG_MOUNT_POINT (1<<2) /* sender */
-#define FLAG_NO_FUZZY (1<<2) /* generator */
+#define FLAG_MOUNT_POINT (1<<2) /* sender/generator */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
-#define FLAG_SENT (1<<3) /* sender */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
+#define FLAG_NO_FUZZY (1<<5) /* generator */
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
@@
-115,9
+115,10
@@
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_OLD_PREFIXES (1<<1)
#define XFLG_ANCHORED2ABS (1<<2)
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_OLD_PREFIXES (1<<1)
#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
@@
-133,11
+134,6
@@
#define FNAMECMP_BACKUP 0x82
#define FNAMECMP_FUZZY 0x83
#define FNAMECMP_BACKUP 0x82
#define FNAMECMP_FUZZY 0x83
-/* For calling delete_file() */
-#define DEL_NO_RECURSE (1<<1)
-#define DEL_FORCE_RECURSE (1<<2) /* recurse even w/o --force */
-#define DEL_TERSE (1<<3)
-
/* For use by the itemize_changes code */
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
/* For use by the itemize_changes code */
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
@@
-152,7
+148,6
@@
#define ITEM_LOCAL_CHANGE (1<<14)
#define ITEM_TRANSFER (1<<15)
/* These are outside the range of the transmitted flags. */
#define ITEM_LOCAL_CHANGE (1<<14)
#define ITEM_TRANSFER (1<<15)
/* These are outside the range of the transmitted flags. */
-#define ITEM_NO_DEST_AND_NO_UPDATE (1<<16) /* used by itemize() */
#define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */
#define ITEM_DELETED (1<<17) /* used by log_formatted() */
#define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */
#define ITEM_DELETED (1<<17) /* used by log_formatted() */
@@
-160,16
+155,17
@@
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
-/* Log-message categories. FLOG and FCLIENT are only used on the daemon
- * side for custom logging -- they don't get sent over the socket. */
-enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4 };
+/* 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, 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, MSG_
FCLIENT=FCLIENT
, /* 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 */
@@
-591,11
+587,11
@@
struct map_struct {
#define MATCHFLG_WILD (1<<0) /* pattern has '*', '[', and/or '?' */
#define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
#define MATCHFLG_WILD (1<<0) /* pattern has '*', '[', and/or '?' */
#define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
-#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with
'**'
*/
-#define MATCHFLG_
ABS_PATH (1<<3) /* path-match on absolute path
*/
-#define MATCHFLG_
INCLUDE (1<<4) /* this is an include, not an exclude
*/
-#define MATCHFLG_
DIRECTORY (1<<5) /* this matches only directories
*/
-#define MATCHFLG_
CLEAR_LIST (1<<6) /* this item is the "!" token
*/
+#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with
"**"
*/
+#define MATCHFLG_
WILD3_SUFFIX (1<<3) /* pattern ends with "***"
*/
+#define MATCHFLG_
ABS_PATH (1<<4) /* path-match on absolute path
*/
+#define MATCHFLG_
INCLUDE (1<<5) /* this is an include, not an exclude
*/
+#define MATCHFLG_
DIRECTORY (1<<6) /* this matches only directories
*/
#define MATCHFLG_WORD_SPLIT (1<<7) /* split rules on whitespace */
#define MATCHFLG_NO_INHERIT (1<<8) /* don't inherit these rules */
#define MATCHFLG_NO_PREFIXES (1<<9) /* parse no prefixes from patterns */
#define MATCHFLG_WORD_SPLIT (1<<7) /* split rules on whitespace */
#define MATCHFLG_NO_INHERIT (1<<8) /* don't inherit these rules */
#define MATCHFLG_NO_PREFIXES (1<<9) /* parse no prefixes from patterns */
@@
-607,6
+603,7
@@
struct map_struct {
#define MATCHFLG_CVS_IGNORE (1<<15)/* rule was -C or :C */
#define MATCHFLG_SENDER_SIDE (1<<16)/* rule applies to the sending side */
#define MATCHFLG_RECEIVER_SIDE (1<<17)/* rule applies to the receiving side */
#define MATCHFLG_CVS_IGNORE (1<<15)/* rule was -C or :C */
#define MATCHFLG_SENDER_SIDE (1<<16)/* rule applies to the sending side */
#define MATCHFLG_RECEIVER_SIDE (1<<17)/* rule applies to the receiving side */
+#define MATCHFLG_CLEAR_LIST (1<<18)/* this item is the "!" token */
#define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \
| MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \
#define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \
| MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \
@@
-643,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"
@@
-650,6
+648,8
@@
struct stats {
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
+#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. */
@@
-693,7
+693,12
@@
extern int errno;
#define SUPPORT_HARD_LINKS 1
#endif
#define SUPPORT_HARD_LINKS 1
#endif
-#define SIGNAL_CAST (RETSIGTYPE (*)())
+#if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+#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
@@
-790,7
+795,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
@@
-798,7
+804,7
@@
extern int errno;
#define INITACCESSPERMS 0700
/* handler for null strings in printf format */
#define INITACCESSPERMS 0700
/* handler for null strings in printf format */
-#define NS(s) ((s)?
safe_fname
(s):"<NULL>")
+#define NS(s) ((s)?(s):"<NULL>")
#if !defined __GNUC__ || defined __APPLE__
/* Apparently the OS X port of gcc gags on __attribute__.
#if !defined __GNUC__ || defined __APPLE__
/* Apparently the OS X port of gcc gags on __attribute__.
@@
-872,7
+878,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;