| Index: fusl/include/sys/fanotify.h
|
| diff --git a/fusl/include/sys/fanotify.h b/fusl/include/sys/fanotify.h
|
| index daab76b13ba7f99b6de071ec82a0d6a1283bb712..bcd325eacc9004c8d5c2b9bccdc633ca3236c1db 100644
|
| --- a/fusl/include/sys/fanotify.h
|
| +++ b/fusl/include/sys/fanotify.h
|
| @@ -6,22 +6,22 @@ extern "C" {
|
| #endif
|
|
|
| struct fanotify_event_metadata {
|
| - unsigned event_len;
|
| - unsigned char vers;
|
| - unsigned char reserved;
|
| - unsigned short metadata_len;
|
| - unsigned long long mask
|
| + unsigned event_len;
|
| + unsigned char vers;
|
| + unsigned char reserved;
|
| + unsigned short metadata_len;
|
| + unsigned long long mask
|
| #ifdef __GNUC__
|
| - __attribute__((__aligned__(8)))
|
| + __attribute__((__aligned__(8)))
|
| #endif
|
| - ;
|
| - int fd;
|
| - int pid;
|
| + ;
|
| + int fd;
|
| + int pid;
|
| };
|
|
|
| struct fanotify_response {
|
| - int fd;
|
| - unsigned response;
|
| + int fd;
|
| + unsigned response;
|
| };
|
|
|
| #define FAN_ACCESS 0x01
|
| @@ -40,10 +40,13 @@ struct fanotify_response {
|
| #define FAN_CLASS_NOTIF 0
|
| #define FAN_CLASS_CONTENT 0x04
|
| #define FAN_CLASS_PRE_CONTENT 0x08
|
| -#define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
|
| +#define FAN_ALL_CLASS_BITS \
|
| + (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
|
| #define FAN_UNLIMITED_QUEUE 0x10
|
| #define FAN_UNLIMITED_MARKS 0x20
|
| -#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS)
|
| +#define FAN_ALL_INIT_FLAGS \
|
| + (FAN_CLOEXEC | FAN_NONBLOCK | FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE | \
|
| + FAN_UNLIMITED_MARKS)
|
| #define FAN_MARK_ADD 0x01
|
| #define FAN_MARK_REMOVE 0x02
|
| #define FAN_MARK_DONT_FOLLOW 0x04
|
| @@ -52,20 +55,29 @@ struct fanotify_response {
|
| #define FAN_MARK_IGNORED_MASK 0x20
|
| #define FAN_MARK_IGNORED_SURV_MODIFY 0x40
|
| #define FAN_MARK_FLUSH 0x80
|
| -#define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_DONT_FOLLOW | FAN_MARK_ONLYDIR | FAN_MARK_MOUNT | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY | FAN_MARK_FLUSH)
|
| +#define FAN_ALL_MARK_FLAGS \
|
| + (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_DONT_FOLLOW | FAN_MARK_ONLYDIR | \
|
| + FAN_MARK_MOUNT | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY | \
|
| + FAN_MARK_FLUSH)
|
| #define FAN_ALL_EVENTS (FAN_ACCESS | FAN_MODIFY | FAN_CLOSE | FAN_OPEN)
|
| #define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM | FAN_ACCESS_PERM)
|
| -#define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS | FAN_ALL_PERM_EVENTS | FAN_Q_OVERFLOW)
|
| +#define FAN_ALL_OUTGOING_EVENTS \
|
| + (FAN_ALL_EVENTS | FAN_ALL_PERM_EVENTS | FAN_Q_OVERFLOW)
|
| #define FANOTIFY_METADATA_VERSION 3
|
| #define FAN_ALLOW 0x01
|
| #define FAN_DENY 0x02
|
| #define FAN_NOFD -1
|
| #define FAN_EVENT_METADATA_LEN (sizeof(struct fanotify_event_metadata))
|
| -#define FAN_EVENT_NEXT(meta, len) ((len) -= (meta)->event_len, (struct fanotify_event_metadata*)(((char *)(meta)) + (meta)->event_len))
|
| -#define FAN_EVENT_OK(meta, len) ((long)(len) >= (long)FAN_EVENT_METADATA_LEN && (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && (long)(meta)->event_len <= (long)(len))
|
| +#define FAN_EVENT_NEXT(meta, len) \
|
| + ((len) -= (meta)->event_len, \
|
| + (struct fanotify_event_metadata*)(((char*)(meta)) + (meta)->event_len))
|
| +#define FAN_EVENT_OK(meta, len) \
|
| + ((long)(len) >= (long)FAN_EVENT_METADATA_LEN && \
|
| + (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && \
|
| + (long)(meta)->event_len <= (long)(len))
|
|
|
| int fanotify_init(unsigned, unsigned);
|
| -int fanotify_mark(int, unsigned, unsigned long long, int, const char *);
|
| +int fanotify_mark(int, unsigned, unsigned long long, int, const char*);
|
|
|
| #ifdef __cplusplus
|
| }
|
|
|