X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3d38277706a5155d57563d1221e7233d8159470a..a039749b4c21e3439dc06fcdd5355828f1f95463:/rsync.h diff --git a/rsync.h b/rsync.h index 0742d431..12dc2c89 100644 --- a/rsync.h +++ b/rsync.h @@ -1,5 +1,5 @@ /* - Copyright (C) Andrew Tridgell 1996 + Copyright (C) by Andrew Tridgell 1996, 2000 Copyright (C) Paul Mackerras 1996 This program is free software; you can redistribute it and/or modify @@ -63,7 +63,7 @@ #define MPLEX_BASE 7 -enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3}; +enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 }; #include "errcode.h" @@ -344,7 +344,6 @@ struct map_struct { }; struct exclude_struct { - char *orig; char *pattern; int regular_exp; int fnmatch_flags; @@ -497,6 +496,14 @@ extern int errno; #endif ; +/* 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 + ; + #ifdef REPLACE_INET_NTOA #define inet_ntoa rep_inet_ntoa #endif @@ -510,4 +517,8 @@ size_t strlcpy(char *d, const char *s, size_t bufsize); size_t strlcat(char *d, const char *s, size_t bufsize); #endif +#ifndef WEXITSTATUS +#define WEXITSTATUS(stat) ((int)(((stat)>>8)&0xFF)) +#endif + #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)