mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

RHEL 5: inotify_init1 call did not exist on RHEL 5.

Browse Source
This commit is contained in:
Richard Jones
2009-08-06 15:44:20 +01:00
parent 690472768c
commit 1503652d07
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/configure.ac
View File

@@ -67,7 +67,7 @@ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
])
dnl Functions which may not be available in older distributions.
AC_CHECK_FUNCS([futimens listxattr llistxattr getxattr lgetxattr setxattr lsetxattr removexattr lremovexattr])
AC_CHECK_FUNCS([futimens listxattr llistxattr getxattr lgetxattr setxattr lsetxattr removexattr lremovexattr inotify_init1])
dnl For modified printf, we need glibc either (old-style)
dnl register_printf_function or (new-style) register_printf_specifier.

22
daemon/inotify.c
View File

@@ -21,6 +21,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/inotify.h>
#include "../src/guestfs_protocol.h"
@@ -70,11 +72,31 @@ do_inotify_init (int max_events)
if (do_inotify_close () == -1)
return -1;
#ifdef HAVE_INOTIFY_INIT1
inotify_fd = inotify_init1 (IN_NONBLOCK | IN_CLOEXEC);
if (inotify_fd == -1) {
reply_with_perror ("inotify_init");
return -1;
}
#else
inotify_fd = inotify_init ();
if (inotify_fd == -1) {
reply_with_perror ("inotify_init");
return -1;
}
if (fcntl (inotify_fd, F_SETFL, O_NONBLOCK) == -1) {
reply_with_perror ("fcntl: O_NONBLOCK");
close (inotify_fd);
inotify_fd = -1;
return -1;
}
if (fcntl (inotify_fd, F_SETFD, FD_CLOEXEC) == -1) {
reply_with_perror ("fcntl: FD_CLOEXEC");
close (inotify_fd);
inotify_fd = -1;
return -1;
}
#endif
return 0;
}