/*
Copyright (C) by Andrew Tridgell 1996, 2000
Copyright (C) Paul Mackerras 1996
- Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+ 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
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 25
+#define PROTOCOL_VERSION 26
/* We refuse to interoperate with versions that are not in this range.
* Note that we assume we'll work with later versions: the onus is on
#include "config.h"
-#if HAVE_REMSH
-#define RSYNC_RSH "remsh"
-#else
-#define RSYNC_RSH "rsh"
-#endif
+/* The default RSYNC_RSH is always set in config.h, either to "remsh",
+ * "rsh", or otherwise something specified by the user. HAVE_REMSH
+ * controls parameter munging for HP/UX, etc. */
#include <sys/types.h>
#include <glob.h>
#endif
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
#include <compat.h>
#endif
+#include <assert.h>
+
#define BOOL int
#elif HAVE_LONGLONG
#define int64 long long
#else
+/* As long as it gets... */
#define int64 off_t
#define NO_INT64
#endif
-#if HAVE_SHORT_INO_T
-# define INO_T uint32
-#elif HAVE_INO_T
-# define INO_T ino_t
-#else
-# define INO_T unsigned
-#endif
+/* Starting from protocol version 26, we always use 64-bit
+ * ino_t and dev_t internally, even if this platform does not
+ * allow files to have 64-bit inums. That's because the
+ * receiver needs to find duplicate (dev,ino) tuples to detect
+ * hardlinks, and it might have files coming from a platform
+ * that has 64-bit inums.
+ *
+ * The only exception is if we're on a platform with no 64-bit type at
+ * all.
+ *
+ * Because we use read_longint() to get these off the wire, if you
+ * transfer devices or hardlinks with dev or inum > 2**32 to a machine
+ * with no 64-bit types then you will get an overflow error. Probably
+ * not many people have that combination of machines, and you can
+ * avoid it by not preserving hardlinks or not transferring device
+ * nodes. It's not clear that any other behaviour is better.
+ *
+ * Note that if you transfer devices from a 64-bit-devt machine (say,
+ * Solaris) to a 32-bit-devt machine (say, Linux-2.2/x86) then the
+ * device numbers will be truncated. But it's a kind of silly thing
+ * to do anyhow.
+ *
+ * FIXME: In future, we should probable split the device number into
+ * major/minor, and transfer the two parts as 32-bit ints. That gives
+ * you somewhat more of a chance that they'll come from a big machine
+ * to a little one in a useful way.
+ *
+ * FIXME: Really we need an unsigned type, and we perhaps ought to
+ * cope with platforms on which this is an unsigned int or even a
+ * struct. Later.
+ */
+#define INO64_T int64
+#define DEV64_T int64
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
time_t modtime;
OFF_T length;
mode_t mode;
- INO_T inode;
- dev_t dev;
- dev_t rdev;
+
+ INO64_T inode;
+ /** Device this file lives upon */
+ DEV64_T dev;
+
+ /** If this is a device node, the device number. */
+ DEV64_T rdev;
uid_t uid;
gid_t gid;
char *basename;
};
struct sum_struct {
- OFF_T flength; /* total file length */
- int count; /* how many chunks */
- int remainder; /* flength % block_length */
- int n; /* block_length */
- struct sum_buf *sums; /* points to info for each chunk */
+ OFF_T flength; /* total file length */
+ size_t count; /* how many chunks */
+ size_t remainder; /* flength % block_length */
+ size_t n; /* block_length */
+ struct sum_buf *sums; /* points to info for each chunk */
};
struct map_struct {
}
#include "byteorder.h"
-#include "proto.h"
#include "lib/mdfour.h"
#include "lib/permstring.h"
+#include "lib/addrinfo.h"
+
+#include "proto.h"
/* We have replacement versions of these if they're missing. */
#ifndef HAVE_ASPRINTF
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
+/* This could be bad on systems which have no lchown and where chown
+ * follows symbollic links. On such systems it might be better not to
+ * try to chown symlinks at all. */
#ifndef HAVE_LCHOWN
#define lchown chown
#endif
/* 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
+
+
/* use magic gcc attributes to catch format errors */
void rprintf(enum logcode , const char *, ...)
-#ifdef __GNUC__
- __attribute__ ((format (printf, 2, 3)))
-#endif
+ __attribute__((format (printf, 2, 3)))
;
/* This is just like rprintf, but it also tries to print some
* representation of the error code. Normally errcode = errno. */
void rsyserr(enum logcode, int, const char *, ...)
-#ifdef __GNUC__
- __attribute__ ((format (printf, 3, 4)))
-#endif
+ __attribute__((format (printf, 3, 4)))
;
#ifdef REPLACE_INET_NTOA
extern int verbose;
-extern struct global_opts {
- /** Network address family. **/
- int af_hint;
-
- /** Do not go into the background when run as --daemon. Good
- * for debugging and required for running as a service on W32,
- * or under Unix process-monitors. **/
- int no_detach;
-} global_opts;
-
-
#ifndef HAVE_INET_NTOP
const char *
inet_ntop(int af, const void *src, char *dst, size_t size);
#ifndef HAVE_INET_PTON
int isc_net_pton(int af, const char *src, void *dst);
#endif
+
+#define UNUSED(x) x __attribute__((__unused__))
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff