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 #if to use "defined".
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
75e3a26
..
488b401
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-60,6
+60,7
@@
#define FLAG_TOP_DIR (1<<0)
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
#define FLAG_TOP_DIR (1<<0)
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
+#define FLAG_NO_FUZZY (1<<2) /* generator only */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
/* update this if you make incompatible changes */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
/* update this if you make incompatible changes */
@@
-127,6
+128,7
@@
#define FNAMECMP_FNAME 0x80
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
#define FNAMECMP_FNAME 0x80
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
+#define FNAMECMP_FUZZY 0x83
/* For calling delete_file() */
#define DEL_DIR (1<<0)
/* For calling delete_file() */
#define DEL_DIR (1<<0)
@@
-155,100
+157,100
@@
enum msgcode {
/* The default RSYNC_RSH is always set in config.h. */
#include <stdio.h>
/* The default RSYNC_RSH is always set in config.h. */
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#if
def
HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#if
def
HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#if
def
STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# if
def
HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !
STDC_HEADERS &&
HAVE_MEMORY_H
+#if
def
HAVE_STRING_H
+# if !
defined STDC_HEADERS && defined
HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#if
def
HAVE_STRINGS_H
# include <strings.h>
#endif
# include <strings.h>
#endif
-#if HAVE_UNISTD_H
+#if
def
HAVE_UNISTD_H
# include <unistd.h>
#endif
# include <unistd.h>
#endif
-#if HAVE_SYS_PARAM_H
+#if
def
HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
-#if
HAVE_MALLOC_H && (HAVE_MALLINFO || !
HAVE_STDLIB_H)
+#if
defined HAVE_MALLOC_H && (defined HAVE_MALLINFO || !defined
HAVE_STDLIB_H)
#include <malloc.h>
#endif
#include <malloc.h>
#endif
-#if HAVE_SYS_SOCKET_H
+#if
def
HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#include <sys/socket.h>
#endif
-#if TIME_WITH_SYS_TIME
+#if
def
TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
#else
#include <sys/time.h>
#include <time.h>
#else
-#if HAVE_SYS_TIME_H
+#if
def
HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <time.h>
#endif
#endif
#include <sys/time.h>
#else
#include <time.h>
#endif
#endif
-#if HAVE_FCNTL_H
+#if
def
HAVE_FCNTL_H
#include <fcntl.h>
#else
#include <fcntl.h>
#else
-#if HAVE_SYS_FCNTL_H
+#if
def
HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
#endif
#include <sys/fcntl.h>
#endif
#endif
-#if HAVE_SYS_IOCTL_H
+#if
def
HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#include <sys/ioctl.h>
#endif
-#if HAVE_SYS_FILIO_H
+#if
def
HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
#include <signal.h>
#include <sys/filio.h>
#endif
#include <signal.h>
-#if HAVE_SYS_WAIT_H
+#if
def
HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <sys/wait.h>
#endif
-#if HAVE_CTYPE_H
+#if
def
HAVE_CTYPE_H
#include <ctype.h>
#endif
#include <ctype.h>
#endif
-#if HAVE_GRP_H
+#if
def
HAVE_GRP_H
#include <grp.h>
#endif
#include <errno.h>
#include <grp.h>
#endif
#include <errno.h>
-#if HAVE_UTIME_H
+#if
def
HAVE_UTIME_H
#include <utime.h>
#endif
#include <utime.h>
#endif
-#if HAVE_SYS_SELECT_H
+#if
def
HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#include <sys/select.h>
#endif
-#if HAVE_SYS_MODE_H
+#if
def
HAVE_SYS_MODE_H
/* apparently AIX needs this for S_ISLNK */
#ifndef S_ISLNK
#include <sys/mode.h>
#endif
#endif
/* apparently AIX needs this for S_ISLNK */
#ifndef S_ISLNK
#include <sys/mode.h>
#endif
#endif
-#if HAVE_GLOB_H
+#if
def
HAVE_GLOB_H
#include <glob.h>
#endif
#include <glob.h>
#endif
@@
-263,31
+265,31
@@
enum msgcode {
#include <syslog.h>
#include <sys/file.h>
#include <syslog.h>
#include <sys/file.h>
-#if HAVE_DIRENT_H
+#if
def
HAVE_DIRENT_H
# include <dirent.h>
#else
# define dirent direct
# include <dirent.h>
#else
# define dirent direct
-# if HAVE_SYS_NDIR_H
+# if
def
HAVE_SYS_NDIR_H
# include <sys/ndir.h>
# endif
# include <sys/ndir.h>
# endif
-# if HAVE_SYS_DIR_H
+# if
def
HAVE_SYS_DIR_H
# include <sys/dir.h>
# endif
# include <sys/dir.h>
# endif
-# if HAVE_NDIR_H
+# if
def
HAVE_NDIR_H
# include <ndir.h>
# endif
#endif
# include <ndir.h>
# endif
#endif
-#if MAJOR_IN_MKDEV
+#if
def
MAJOR_IN_MKDEV
#include <sys/mkdev.h>
#include <sys/mkdev.h>
-# if !defined
(makedev) && defined(mkdev)
+# if !defined
makedev && defined mkdev
# define makedev mkdev
# endif
# define makedev mkdev
# endif
-#elif MAJOR_IN_SYSMACROS
+#elif
defined
MAJOR_IN_SYSMACROS
#include <sys/sysmacros.h>
#endif
#include <sys/sysmacros.h>
#endif
-#if HAVE_COMPAT_H
+#if
def
HAVE_COMPAT_H
#include <compat.h>
#endif
#include <compat.h>
#endif
@@
-301,7
+303,7
@@
enum msgcode {
#define uchar unsigned char
#endif
#define uchar unsigned char
#endif
-#if SIGNED_CHAR_OK
+#if
def
SIGNED_CHAR_OK
#define schar signed char
#else
#define schar char
#define schar signed char
#else
#define schar char
@@
-337,7
+339,7
@@
enum msgcode {
#define uint32 unsigned int32
#endif
#define uint32 unsigned int32
#endif
-#if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !HAVE_STRUCT_STAT64
+#if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !
defined
HAVE_STRUCT_STAT64
#define OFF_T off_t
#define STRUCT_STAT struct stat
#else
#define OFF_T off_t
#define STRUCT_STAT struct stat
#else
@@
-613,36
+615,36
@@
struct stats {
#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. */
-#if
!
HAVE_ASPRINTF
+#if
ndef
HAVE_ASPRINTF
int asprintf(char **ptr, const char *format, ...);
#endif
int asprintf(char **ptr, const char *format, ...);
#endif
-#if
!
HAVE_VASPRINTF
+#if
ndef
HAVE_VASPRINTF
int vasprintf(char **ptr, const char *format, va_list ap);
#endif
int vasprintf(char **ptr, const char *format, va_list ap);
#endif
-#if !
HAVE_VSNPRINTF || !
HAVE_C99_VSNPRINTF
+#if !
defined HAVE_VSNPRINTF || !defined
HAVE_C99_VSNPRINTF
#define vsnprintf rsync_vsnprintf
int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
#endif
#define vsnprintf rsync_vsnprintf
int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
#endif
-#if !
HAVE_SNPRINTF || !
HAVE_C99_VSNPRINTF
+#if !
defined HAVE_SNPRINTF || !defined
HAVE_C99_VSNPRINTF
#define snprintf rsync_snprintf
int snprintf(char *str,size_t count,const char *fmt,...);
#endif
#define snprintf rsync_snprintf
int snprintf(char *str,size_t count,const char *fmt,...);
#endif
-#if
!
HAVE_STRERROR
+#if
ndef
HAVE_STRERROR
extern char *sys_errlist[];
#define strerror(i) sys_errlist[i]
#endif
extern char *sys_errlist[];
#define strerror(i) sys_errlist[i]
#endif
-#if
!
HAVE_STRCHR
+#if
ndef
HAVE_STRCHR
# define strchr index
# define strrchr rindex
#endif
# define strchr index
# define strrchr rindex
#endif
-#if
!
HAVE_ERRNO_DECL
+#if
ndef
HAVE_ERRNO_DECL
extern int errno;
#endif
extern int errno;
#endif
@@
-732,7
+734,7
@@
extern int errno;
/* work out what fcntl flag to use for non-blocking */
#ifdef O_NONBLOCK
# define NONBLOCK_FLAG O_NONBLOCK
/* work out what fcntl flag to use for non-blocking */
#ifdef O_NONBLOCK
# define NONBLOCK_FLAG O_NONBLOCK
-#elif defined
(SYSV)
+#elif defined
SYSV
# define NONBLOCK_FLAG O_NDELAY
#else
# define NONBLOCK_FLAG FNDELAY
# define NONBLOCK_FLAG O_NDELAY
#else
# define NONBLOCK_FLAG FNDELAY
@@
-756,7
+758,7
@@
extern int errno;
/* handler for null strings in printf format */
#define NS(s) ((s)?safe_fname(s):"<NULL>")
/* handler for null strings in printf format */
#define NS(s) ((s)?safe_fname(s):"<NULL>")
-#if !defined
(__GNUC__) || defined(APPLE)
+#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> */
/* Apparently the OS X port of gcc gags on __attribute__.
*
* <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
@@
-780,7
+782,7
@@
void rsyserr(enum logcode, int, const char *, ...)
__attribute__((format (printf, 3, 4)))
;
__attribute__((format (printf, 3, 4)))
;
-#if REPLACE_INET_NTOA
+#if
def
REPLACE_INET_NTOA
#define inet_ntoa rep_inet_ntoa
#endif
#define inet_ntoa rep_inet_ntoa
#endif
@@
-789,11
+791,11
@@
void rsyserr(enum logcode, int, const char *, ...)
#define O_BINARY 0
#endif
#define O_BINARY 0
#endif
-#if
!
HAVE_STRLCPY
+#if
ndef
HAVE_STRLCPY
size_t strlcpy(char *d, const char *s, size_t bufsize);
#endif
size_t strlcpy(char *d, const char *s, size_t bufsize);
#endif
-#if
!
HAVE_STRLCAT
+#if
ndef
HAVE_STRLCAT
size_t strlcat(char *d, const char *s, size_t bufsize);
#endif
size_t strlcat(char *d, const char *s, size_t bufsize);
#endif
@@
-803,13
+805,13
@@
size_t strlcat(char *d, const char *s, size_t bufsize);
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
-#if HAVE_GETEUID
+#if
def
HAVE_GETEUID
#define MY_UID() geteuid()
#else
#define MY_UID() getuid()
#endif
#define MY_UID() geteuid()
#else
#define MY_UID() getuid()
#endif
-#if HAVE_GETEGID
+#if
def
HAVE_GETEGID
#define MY_GID() getegid()
#else
#define MY_GID() getgid()
#define MY_GID() getegid()
#else
#define MY_GID() getgid()
@@
-817,11
+819,11
@@
size_t strlcat(char *d, const char *s, size_t bufsize);
extern int verbose;
extern int verbose;
-#if
!
HAVE_INET_NTOP
+#if
ndef
HAVE_INET_NTOP
const char *inet_ntop(int af, const void *src, char *dst, size_t size);
const char *inet_ntop(int af, const void *src, char *dst, size_t size);
-#endif
/* !HAVE_INET_NTOP */
+#endif
-#if
!
HAVE_INET_PTON
+#if
ndef
HAVE_INET_PTON
int inet_pton(int af, const char *src, void *dst);
#endif
int inet_pton(int af, const char *src, void *dst);
#endif