-/*
+/*
Copyright (C) by Andrew Tridgell 1996, 2000
Copyright (C) Paul Mackerras 1996
Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define MPLEX_BASE 7
-#define NO_EXCLUDES 0
-#define SERVER_EXCLUDES 1
-#define ALL_EXCLUDES 2
+#define NO_FILTERS 0
+#define SERVER_FILTERS 1
+#define ALL_FILTERS 2
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_DEF_INCLUDE (1<<1)
/* For calling delete_file() */
#define DEL_DIR (1<<0)
-#define DEL_RECURSE (1<<1) /* recurse even w/o --force */
-#define DEL_TERSE (1<<2)
+#define DEL_NO_RECURSE (1<<1)
+#define DEL_FORCE_RECURSE (1<<2) /* recurse even w/o --force */
+#define DEL_TERSE (1<<3)
/* Log-message categories. FLOG is only used on the daemon side to
/* The default RSYNC_RSH is always set in config.h. */
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include <stdio.h>
-#include <stddef.h>
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
#endif
-#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H))
+#if HAVE_MALLOC_H && (HAVE_MALLINFO || !HAVE_STDLIB_H)
#include <malloc.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
+#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
+#if TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
#else
-#ifdef HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#else
#include <time.h>
#endif
#endif
-#ifdef HAVE_FCNTL_H
+#if HAVE_FCNTL_H
#include <fcntl.h>
#else
-#ifdef HAVE_SYS_FCNTL_H
+#if HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
#endif
-#include <sys/stat.h>
-
-#ifdef HAVE_SYS_IOCTL_H
+#if HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
-#ifdef HAVE_SYS_FILIO_H
+#if HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
#include <signal.h>
-#ifdef HAVE_SYS_WAIT_H
+#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
-#ifdef HAVE_CTYPE_H
+#if HAVE_CTYPE_H
#include <ctype.h>
#endif
-#ifdef HAVE_GRP_H
+#if HAVE_GRP_H
#include <grp.h>
#endif
#include <errno.h>
-#ifdef HAVE_UTIME_H
+#if HAVE_UTIME_H
#include <utime.h>
#endif
-#ifdef HAVE_SYS_SELECT_H
+#if HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
-#ifdef HAVE_SYS_MODE_H
+#if HAVE_SYS_MODE_H
/* apparently AIX needs this for S_ISLNK */
#ifndef S_ISLNK
#include <sys/mode.h>
#endif
#endif
-#ifdef HAVE_GLOB_H
+#if HAVE_GLOB_H
#include <glob.h>
#endif
#include <sys/sysmacros.h>
#endif
-#ifdef HAVE_COMPAT_H
+#if HAVE_COMPAT_H
#include <compat.h>
#endif
#define uchar unsigned char
#endif
-#if HAVE_UNSIGNED_CHAR
+#if SIGNED_CHAR_OK
#define schar signed char
#else
#define schar char
#define uint32 unsigned int32
#endif
-#if HAVE_OFF64_T
+#if SIZEOF_OFF64_T
#define OFF_T off64_t
#define STRUCT_STAT struct stat64
#else
#define STRUCT_STAT struct stat
#endif
-#if HAVE_OFF64_T
-#define int64 off64_t
-#elif (SIZEOF_LONG == 8)
-#define int64 long
-#elif (SIZEOF_INT == 8)
-#define int64 int
-#elif HAVE_LONGLONG
-#define int64 long long
+/* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF
+ * that's the maximum size the file system can handle and there is no
+ * 64-bit type available. The rsync source must therefore take steps
+ * to ensure that any code that really requires a 64-bit integer has
+ * it (e.g. the checksum code uses two 32-bit integers for its 64-bit
+ * counter). */
+#if SIZEOF_OFF64_T == 8
+# define int64 off64_t
+# define SIZEOF_INT64 8
+#elif SIZEOF_LONG == 8
+# define int64 long
+# define SIZEOF_INT64 8
+#elif SIZEOF_INT == 8
+# define int64 int
+# define SIZEOF_INT64 8
+#elif SIZEOF_LONG_LONG == 8
+# define int64 long long
+# define SIZEOF_INT64 8
+#elif SIZEOF_OFF_T == 8
+# define int64 off_t
+# define SIZEOF_INT64 8
+#elif SIZEOF_INT > 8
+# define int64 int
+# define SIZEOF_INT64 SIZEOF_INT
+#elif SIZEOF_LONG > 8
+# define int64 long
+# define SIZEOF_INT64 SIZEOF_LONG
+#elif SIZEOF_LONG_LONG > 8
+# define int64 long long
+# define SIZEOF_INT64 SIZEOF_LONG_LONG
#else
/* As long as it gets... */
-#define int64 off_t
-#define INT64_IS_OFF_T
+# define int64 off_t
+# define SIZEOF_INT64 SIZEOF_OFF_T
#endif
/* Starting from protocol version 26, we always use 64-bit
*
* FIXME: I don't think the code in flist.c has ever worked on a system
* where dev_t is a struct.
- */
+ */
struct idev {
int64 inode;
#define MATCHFLG_PERDIR_MERGE (1<<11)/* merge-file is searched per-dir */
#define MATCHFLG_EXCLUDE_SELF (1<<12)/* merge-file name should be excluded */
#define MATCHFLG_FINISH_SETUP (1<<13)/* per-dir merge file needs setup */
-struct exclude_struct {
- struct exclude_struct *next;
+struct filter_struct {
+ struct filter_struct *next;
char *pattern;
unsigned int match_flags;
union {
int slash_cnt;
- struct exclude_list_struct *mergelist;
+ struct filter_list_struct *mergelist;
} u;
};
-struct exclude_list_struct {
- struct exclude_struct *head;
- struct exclude_struct *tail;
+struct filter_list_struct {
+ struct filter_struct *head;
+ struct filter_struct *tail;
char *debug_type;
};
int64 total_read;
int64 literal_data;
int64 matched_data;
+ int64 flist_buildtime;
+ int64 flist_xfertime;
int flist_size;
int num_files;
int num_transferred_files;
#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
#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
# define NONBLOCK_FLAG O_NONBLOCK
#elif defined(SYSV)
# define NONBLOCK_FLAG O_NDELAY
-#else
+#else
# define NONBLOCK_FLAG FNDELAY
#endif
/* Apparently the OS X port of gcc gags on __attribute__.
*
* <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
-#define __attribute__(x)
+#define __attribute__(x)
#endif
__attribute__((format (printf, 3, 4)))
;
-#ifdef REPLACE_INET_NTOA
+#if REPLACE_INET_NTOA
#define inet_ntoa rep_inet_ntoa
#endif
#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
#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()
extern int verbose;
-#ifndef HAVE_INET_NTOP
-const char *
-inet_ntop(int af, const void *src, char *dst, size_t size);
+#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
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff