X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1d54358e5207f5f5326dc9e9f362671275c86b22..fcb69e5cdcfdfd0bdcea2127e5f4c9133a2282b9:/rsync.h diff --git a/rsync.h b/rsync.h index 5091a9e5..689965d6 100644 --- a/rsync.h +++ b/rsync.h @@ -1,7 +1,7 @@ /* Copyright (C) by Andrew Tridgell 1996, 2000 Copyright (C) Paul Mackerras 1996 - Copyright (C) 2001 by Martin Pool + Copyright (C) 2001, 2002 by Martin Pool 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 @@ -49,7 +49,7 @@ #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 @@ -85,11 +85,9 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #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 @@ -185,6 +183,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include #endif +#ifdef HAVE_MALLOC_H +# include +#endif + /* these are needed for the uid/gid mapping code */ #include #include @@ -215,6 +217,8 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include #endif +#include + #define BOOL int @@ -263,17 +267,44 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #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)) @@ -304,9 +335,13 @@ struct file_struct { 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; @@ -342,11 +377,11 @@ struct sum_buf { }; 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 { @@ -387,10 +422,11 @@ static inline int flist_up(struct file_list *flist, int i) } #include "byteorder.h" -#include "version.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 @@ -427,6 +463,9 @@ extern int errno; #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 @@ -527,19 +566,24 @@ extern int errno; /* handler for null strings in printf format */ #define NS(s) ((s)?(s):"") +#if !defined(__GNUC__) || defined(APPLE) +/* Apparently the OS X port of gcc gags on __attribute__. + * + * */ +#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 @@ -563,3 +607,14 @@ size_t strlcat(char *d, const char *s, size_t bufsize); extern int verbose; + +#ifndef 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 +int isc_net_pton(int af, const char *src, void *dst); +#endif + +#define UNUSED(x) x __attribute__((__unused__))