X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d679c8390aa7579eb627837a0498c3981e745dad..5b5f7e3b59ec2e2b45a35edf337cbed7fcd94f30:/rsync.h diff --git a/rsync.h b/rsync.h index 05224e3f..013ba700 100644 --- a/rsync.h +++ b/rsync.h @@ -157,91 +157,101 @@ enum msgcode { /* The default RSYNC_RSH is always set in config.h. */ -#include - -#ifdef HAVE_UNISTD_H -#include -#endif #include -#include - -#ifdef HAVE_SYS_PARAM_H -#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_UNISTD_H +# include #endif -#ifdef HAVE_STDLIB_H -#include +#if HAVE_SYS_PARAM_H +#include #endif -#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H)) +#if HAVE_MALLOC_H && (HAVE_MALLINFO || !HAVE_STDLIB_H) #include #endif -#ifdef HAVE_SYS_SOCKET_H +#if HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef TIME_WITH_SYS_TIME +#if TIME_WITH_SYS_TIME #include #include #else -#ifdef HAVE_SYS_TIME_H +#if HAVE_SYS_TIME_H #include #else #include #endif #endif -#ifdef HAVE_FCNTL_H +#if HAVE_FCNTL_H #include #else -#ifdef HAVE_SYS_FCNTL_H +#if HAVE_SYS_FCNTL_H #include #endif #endif -#include - -#ifdef HAVE_SYS_IOCTL_H +#if HAVE_SYS_IOCTL_H #include #endif -#ifdef HAVE_SYS_FILIO_H +#if HAVE_SYS_FILIO_H #include #endif #include -#ifdef HAVE_SYS_WAIT_H +#if HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_CTYPE_H +#if HAVE_CTYPE_H #include #endif -#ifdef HAVE_GRP_H +#if HAVE_GRP_H #include #endif #include -#ifdef HAVE_UTIME_H +#if HAVE_UTIME_H #include #endif -#ifdef HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_SYS_MODE_H +#if HAVE_SYS_MODE_H /* apparently AIX needs this for S_ISLNK */ #ifndef S_ISLNK #include #endif #endif -#ifdef HAVE_GLOB_H +#if HAVE_GLOB_H #include #endif @@ -280,7 +290,7 @@ enum msgcode { #include #endif -#ifdef HAVE_COMPAT_H +#if HAVE_COMPAT_H #include #endif @@ -300,30 +310,43 @@ enum msgcode { #define schar char #endif +/* Find a variable that is either exactly 32-bits or longer. + * If some code depends on 32-bit truncation, it will need to + * take special action in a "#if SIZEOF_INT32 > 4" section. */ #ifndef int32 -#if (SIZEOF_INT == 4) -#define int32 int -#elif (SIZEOF_LONG == 4) -#define int32 long -#elif (SIZEOF_SHORT == 4) -#define int32 short +#if SIZEOF_INT == 4 +# define int32 int +# define SIZEOF_INT32 4 +#elif SIZEOF_LONG == 4 +# define int32 long +# define SIZEOF_INT32 4 +#elif SIZEOF_SHORT == 4 +# define int32 short +# define SIZEOF_INT32 4 +#elif SIZEOF_INT > 4 +# define int32 int +# define SIZEOF_INT32 SIZEOF_INT +#elif SIZEOF_LONG > 4 +# define int32 long +# define SIZEOF_INT32 SIZEOF_LONG #else -/* I hope this works */ -#define int32 int -#define LARGE_INT32 +# error Could not find a 32-bit integer variable #endif +#else +# define SIZEOF_INT32 4 #endif #ifndef uint32 #define uint32 unsigned int32 #endif -#if SIZEOF_OFF64_T -#define OFF_T off64_t -#define STRUCT_STAT struct stat64 -#else +#if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !HAVE_STRUCT_STAT64 #define OFF_T off_t #define STRUCT_STAT struct stat +#else +#define OFF_T off64_t +#define STRUCT_STAT struct stat64 +#define USE_STAT64_FUNCS 1 #endif /* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF @@ -589,20 +612,20 @@ static inline int flist_up(struct file_list *flist, int i) #include "proto.h" /* We have replacement versions of these if they're missing. */ -#ifndef HAVE_ASPRINTF +#if !HAVE_ASPRINTF int asprintf(char **ptr, const char *format, ...); #endif -#ifndef HAVE_VASPRINTF +#if !HAVE_VASPRINTF int vasprintf(char **ptr, const char *format, va_list ap); #endif -#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#if !HAVE_VSNPRINTF || !HAVE_C99_VSNPRINTF #define vsnprintf rsync_vsnprintf int vsnprintf(char *str, size_t count, const char *fmt, va_list args); #endif -#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#if !HAVE_SNPRINTF || !HAVE_C99_VSNPRINTF #define snprintf rsync_snprintf int snprintf(char *str,size_t count,const char *fmt,...); #endif @@ -613,12 +636,12 @@ extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] #endif -#ifndef HAVE_STRCHR +#if !HAVE_STRCHR # define strchr index # define strrchr rindex #endif -#ifndef HAVE_ERRNO_DECL +#if !HAVE_ERRNO_DECL extern int errno; #endif @@ -756,7 +779,7 @@ void rsyserr(enum logcode, int, const char *, ...) __attribute__((format (printf, 3, 4))) ; -#ifdef REPLACE_INET_NTOA +#if REPLACE_INET_NTOA #define inet_ntoa rep_inet_ntoa #endif @@ -765,11 +788,11 @@ void rsyserr(enum logcode, int, const char *, ...) #define O_BINARY 0 #endif -#ifndef HAVE_STRLCPY +#if !HAVE_STRLCPY size_t strlcpy(char *d, const char *s, size_t bufsize); #endif -#ifndef HAVE_STRLCAT +#if !HAVE_STRLCAT size_t strlcat(char *d, const char *s, size_t bufsize); #endif @@ -779,13 +802,13 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__) -#ifdef HAVE_GETEUID +#if HAVE_GETEUID #define MY_UID() geteuid() #else #define MY_UID() getuid() #endif -#ifdef HAVE_GETEGID +#if HAVE_GETEGID #define MY_GID() getegid() #else #define MY_GID() getgid() @@ -793,11 +816,11 @@ size_t strlcat(char *d, const char *s, size_t bufsize); extern int verbose; -#ifndef HAVE_INET_NTOP +#if !HAVE_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif /* !HAVE_INET_NTOP */ -#ifndef HAVE_INET_PTON +#if !HAVE_INET_PTON int inet_pton(int af, const char *src, void *dst); #endif