X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8dd99390f59826f37d3e6d485cfbd0d150623078..fe1c19dcdfa000c2461e85ed7bf712de49904377:/rsync.h diff --git a/rsync.h b/rsync.h index cf018bba..75e3a26b 100644 --- a/rsync.h +++ b/rsync.h @@ -1,18 +1,18 @@ -/* +/* Copyright (C) by Andrew Tridgell 1996, 2000 Copyright (C) Paul Mackerras 1996 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 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. @@ -27,7 +27,7 @@ #define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO" #define RSYNC_NAME "rsync" -#define RSYNCD_SYSCONF "/etc/rsyncd.conf" +/* RSYNCD_SYSCONF is now set in config.h */ #define RSYNCD_USERCONF "rsyncd.conf" #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" @@ -39,19 +39,31 @@ incompatible with older versions :-( */ #define CHAR_OFFSET 0 - -#define FLAG_DELETE (1<<0) -#define SAME_MODE (1<<1) -#define SAME_RDEV (1<<2) -#define SAME_UID (1<<3) -#define SAME_GID (1<<4) -#define SAME_DIR (1<<5) -#define SAME_NAME SAME_DIR -#define LONG_NAME (1<<6) -#define SAME_TIME (1<<7) +/* These flags are only used during the flist transfer. */ + +#define XMIT_TOP_DIR (1<<0) +#define XMIT_SAME_MODE (1<<1) +#define XMIT_EXTENDED_FLAGS (1<<2) +#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */ +#define XMIT_SAME_UID (1<<3) +#define XMIT_SAME_GID (1<<4) +#define XMIT_SAME_NAME (1<<5) +#define XMIT_LONG_NAME (1<<6) +#define XMIT_SAME_TIME (1<<7) +#define XMIT_SAME_RDEV_MAJOR (1<<8) +#define XMIT_HAS_IDEV_DATA (1<<9) +#define XMIT_SAME_DEV (1<<10) +#define XMIT_RDEV_MINOR_IS_SMALL (1<<11) + +/* These flags are used in the live flist data. */ + +#define FLAG_TOP_DIR (1<<0) +#define FLAG_HLINK_EOL (1<<1) /* generator only */ +#define FLAG_MOUNT_POINT (1<<2) /* sender only */ +#define FLAG_DEL_HERE (1<<3) /* receiver/generator */ /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 27 +#define PROTOCOL_VERSION 29 /* 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 @@ -70,8 +82,8 @@ * unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and * MAX_PROTOCOL_VERSION. */ -#define MIN_PROTOCOL_VERSION 17 -#define OLD_PROTOCOL_VERSION 20 +#define MIN_PROTOCOL_VERSION 20 +#define OLD_PROTOCOL_VERSION 25 #define MAX_PROTOCOL_VERSION 40 #define RSYNC_PORT 873 @@ -81,28 +93,60 @@ #define CHUNK_SIZE (32*1024) #define MAX_MAP_SIZE (256*1024) #define IO_BUFFER_SIZE (4092) +#define MAX_BLOCK_SIZE ((int32)1 << 29) #define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */ #define IOERR_VANISHED (1<<1) #define MAX_ARGS 1000 +#define MAX_BASIS_DIRS 20 + #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_OLD_PREFIXES (1<<1) +#define XFLG_ANCHORED2ABS (1<<2) -#define MISSING_OK 0 -#define MISSING_FATAL 1 +#define PERMS_REPORT (1<<0) +#define PERMS_SKIP_MTIME (1<<1) -#define ADD_INCLUDE 1 -#define ADD_EXCLUDE 0 +#define FULL_FLUSH 1 +#define NORMAL_FLUSH 0 -/* Log values. I *think* what these mean is: FLOG goes to the server - * logfile; FERROR and FINFO try to end up on the client, with - * different levels of filtering. */ -enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; +#define PDIR_CREATE 1 +#define PDIR_DELETE 0 + +/* Note: 0x00 - 0x7F are used for basis_dir[] indexes! */ +#define FNAMECMP_BASIS_DIR_LOW 0x00 /* Must remain 0! */ +#define FNAMECMP_BASIS_DIR_HIGH 0x7F +#define FNAMECMP_FNAME 0x80 +#define FNAMECMP_PARTIAL_DIR 0x81 +#define FNAMECMP_BACKUP 0x82 + +/* For calling delete_file() */ +#define DEL_DIR (1<<0) +#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 + * output messages to the log file. */ +enum logcode { FERROR=1, FINFO=2, FLOG=3 }; + +/* Messages types that are sent over the message channel. The logcode + * values must all be present here with identical numbers. */ +enum msgcode { + MSG_DONE=5, /* current phase is done */ + MSG_REDO=4, /* reprocess indicated flist index */ + MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */ + MSG_DATA=0 /* raw data on the multiplexed stream */ +}; #include "errcode.h" @@ -110,91 +154,101 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; /* 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 @@ -224,12 +278,22 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; # endif #endif -#ifdef HAVE_COMPAT_H +#if MAJOR_IN_MKDEV +#include +# if !defined(makedev) && defined(mkdev) +# define makedev mkdev +# endif +#elif MAJOR_IN_SYSMACROS +#include +#endif + +#if HAVE_COMPAT_H #include #endif #include +#include "lib/pool_alloc.h" #define BOOL int @@ -237,61 +301,85 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #define uchar unsigned char #endif -#if HAVE_UNSIGNED_CHAR +#if SIGNED_CHAR_OK #define schar signed char #else #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 HAVE_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 -#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 #else -/* As long as it gets... */ -#define int64 off_t -#define NO_INT64 -#endif - -#if (SIZEOF_LONG == 8) -#define uint64 unsigned long -#elif (SIZEOF_INT == 8) -#define uint64 unsigned int -#elif HAVE_LONGLONG -#define uint64 unsigned long long +#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 + * 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 uint64 unsigned off_t +# define int64 off_t +# define SIZEOF_INT64 SIZEOF_OFF_T #endif /* Starting from protocol version 26, we always use 64-bit @@ -316,17 +404,14 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; * 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 uint64 -#define DEV64_T uint64 + * 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; + int64 dev; +}; #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -362,85 +447,145 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #define IN_LOOPBACKNET 127 #endif -struct file_struct { - unsigned flags; - time_t modtime; - OFF_T length; - mode_t mode; +#define GID_NONE ((gid_t)-1) - INO64_T inode; - /** Device this file lives upon */ - DEV64_T dev; +#define HL_CHECK_MASTER 0 +#define HL_SKIP 1 - /** If this is a device node, the device number. */ - DEV64_T rdev; - uid_t uid; - gid_t gid; - char *basename; - char *dirname; - char *basedir; - char *link; - char *sum; +struct hlink { + struct file_struct *next; + int hlindex; }; +#define F_DEV link_u.idev->dev +#define F_INODE link_u.idev->inode -#define ARENA_SIZE (32 * 1024) +#define F_HLINDEX link_u.links->hlindex +#define F_NEXT link_u.links->next -struct string_area { - char *base; - char *end; - char *current; - struct string_area *next; +struct file_struct { + union { + dev_t rdev; /* The device number, if this is a device */ + char *sum; /* Only a normal file can have a checksum */ + char *link; /* Points to symlink string, if a symlink */ + } u; + OFF_T length; + char *basename; /* The current item's name (AKA filename) */ + char *dirname; /* The directory info inside the transfer */ + union { + char *root; /* Sender-side dir info outside transfer */ + int depth; /* Receiver-side directory depth info */ + } dir; + union { + struct idev *idev; + struct hlink *links; + } link_u; + time_t modtime; + uid_t uid; + gid_t gid; + mode_t mode; + uchar flags; /* this item MUST remain last */ }; +/* + * Start the flist array at FLIST_START entries and grow it + * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR + */ +#define FLIST_START (32 * 1024) +#define FLIST_LINEAR (FLIST_START * 512) + +/* + * Extent size for allocation pools A minimum size of 128KB + * is needed to mmap them so that freeing will release the + * space to the OS. + * + * Larger sizes reduce leftover fragments and speed free calls + * (when they happen) Smaller sizes increase the chance of + * freed allocations freeing whole extents. + */ +#define FILE_EXTENT (256 * 1024) +#define HLINK_EXTENT (128 * 1024) + +#define WITH_HLINK 1 +#define WITHOUT_HLINK 0 + struct file_list { + struct file_struct **files; + alloc_pool_t file_pool; + alloc_pool_t hlink_pool; int count; int malloced; - struct file_struct **files; - struct string_area *string_area; + int low, high; }; +#define SUMFLG_SAME_OFFSET (1<<0) + struct sum_buf { OFF_T offset; /**< offset in file of this chunk */ - int len; /**< length of chunk of file */ - int i; /**< index of this chunk */ + int32 len; /**< length of chunk of file */ uint32 sum1; /**< simple checksum */ + short flags; /**< flag bits */ char sum2[SUM_LENGTH]; /**< checksum */ }; struct sum_struct { OFF_T flength; /**< total file length */ - size_t count; /**< how many chunks */ - size_t remainder; /**< flength % block_length */ - size_t blength; /**< block_length */ - size_t s2length; /**< sum2_length */ struct sum_buf *sums; /**< points to info for each chunk */ + size_t count; /**< how many chunks */ + int32 blength; /**< block_length */ + int32 remainder; /**< flength % block_length */ + int s2length; /**< sum2_length */ }; struct map_struct { - char *p; /* Window pointer */ - int fd; /* File Descriptor */ - int p_size; /* Window size at allocation */ - int p_len; /* Window size after fill */ - /* p_size and p_len could be - * consolodated by using a local - * variable in map_ptr() */ - int status; /* first errno from read errors */ OFF_T file_size; /* File size (from stat) */ OFF_T p_offset; /* Window start */ OFF_T p_fd_offset; /* offset of cursor in fd ala lseek */ + char *p; /* Window pointer */ + int32 p_size; /* Largest window size we allocated */ + int32 p_len; /* Latest (rounded) window size */ + int32 def_window_size; /* Default window size */ + int fd; /* File Descriptor */ + int status; /* first errno from read errors */ }; #define MATCHFLG_WILD (1<<0) /* pattern has '*', '[', and/or '?' */ #define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */ #define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */ #define MATCHFLG_ABS_PATH (1<<3) /* path-match on absolute path */ -struct exclude_struct { +#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */ +#define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */ +#define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */ +#define MATCHFLG_WORD_SPLIT (1<<7) /* split rules on whitespace */ +#define MATCHFLG_NO_INHERIT (1<<8) /* don't inherit these rules */ +#define MATCHFLG_NO_PREFIXES (1<<9) /* parse no prefixes from patterns */ +#define MATCHFLG_MERGE_FILE (1<<10)/* specifies a file to merge */ +#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 */ +#define MATCHFLG_NEGATE (1<<14)/* rule matches when pattern does not */ +#define MATCHFLG_CVS_IGNORE (1<<15)/* rule was -C or :C */ +#define MATCHFLG_SENDER_SIDE (1<<16)/* rule applies to the sending side */ +#define MATCHFLG_RECEIVER_SIDE (1<<17)/* rule applies to the receiving side */ + +#define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \ + | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \ + | MATCHFLG_NEGATE | MATCHFLG_RECEIVER_SIDE) + +struct filter_struct { + struct filter_struct *next; char *pattern; - int match_flags; - int include; - int directory; - int slash_cnt; + uint32 match_flags; + union { + int slash_cnt; + struct filter_list_struct *mergelist; + } u; +}; + +struct filter_list_struct { + struct filter_struct *head; + struct filter_struct *tail; + char *debug_type; }; struct stats { @@ -450,21 +595,15 @@ struct stats { 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; + int current_file_index; }; -/* we need this function because of the silly way in which duplicate - entries are handled in the file lists - we can't change this - without breaking existing versions */ -static inline int flist_up(struct file_list *flist, int i) -{ - while (!flist->files[i]->basename) i++; - return i; -} - #include "byteorder.h" #include "lib/mdfour.h" #include "lib/wildmatch.h" @@ -474,20 +613,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 @@ -498,25 +637,18 @@ 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 #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 - #define SIGNAL_CAST (RETSIGTYPE (*)()) #ifndef EWOULDBLOCK @@ -535,6 +667,10 @@ extern int errno; #define STDERR_FILENO 2 #endif +#ifndef S_IRUSR +#define S_IRUSR 0400 +#endif + #ifndef S_IWUSR #define S_IWUSR 0200 #endif @@ -598,7 +734,7 @@ extern int errno; # define NONBLOCK_FLAG O_NONBLOCK #elif defined(SYSV) # define NONBLOCK_FLAG O_NDELAY -#else +#else # define NONBLOCK_FLAG FNDELAY #endif @@ -618,13 +754,13 @@ extern int errno; #define INITACCESSPERMS 0700 /* handler for null strings in printf format */ -#define NS(s) ((s)?(s):"") +#define NS(s) ((s)?safe_fname(s):"") #if !defined(__GNUC__) || defined(APPLE) /* Apparently the OS X port of gcc gags on __attribute__. * * */ -#define __attribute__(x) +#define __attribute__(x) #endif @@ -644,7 +780,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 @@ -653,11 +789,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 @@ -667,15 +803,25 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__) +#if HAVE_GETEUID +#define MY_UID() geteuid() +#else +#define MY_UID() getuid() +#endif + +#if HAVE_GETEGID +#define MY_GID() getegid() +#else +#define MY_GID() getgid() +#endif 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