Attachment 19068 Details for Bug 17696 – patch

[patch] patch

patch-inotify-hal (text/plain), 8.80 KB, created by Adrian Bunk on 2008-09-21 09:54:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Bunk

Created: 2008-09-21 09:54:30 UTC

Size: 8.80 KB

patch

obsolete

>
>diff --git a/NEWS b/NEWS
>index 483ee1c..e63a068 100644
>--- a/NEWS
>+++ b/NEWS
>@@ -7,6 +7,7 @@ Released Month 00, 2008.
> Requirements for HAL 0.5.12:
> 
>  - Linux kernel     >= 2.6.19
>+ - glibc            >= 2.4       (Linux only, for sys/inotify.h)
>  - util-linux       >= 2.12r1    (--enable-umount-helper requires patch
>                                     from RH #188193; it's in util-linux-ng 2.13)
>  - bash             >= 2.0
>diff --git a/configure.in b/configure.in
>index f7d235d..928b526 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -38,7 +38,7 @@ AC_PROG_LN_S
> AC_SYS_LARGEFILE
> PKG_PROG_PKG_CONFIG
> 
>-AC_CHECK_HEADERS([sys/ioccom.h sys/inotify.h])
>+AC_CHECK_HEADERS([sys/ioccom.h])
> 
> AC_ARG_WITH([os-type],
> 	    AS_HELP_STRING([--with-os-type=<os>],
>@@ -1023,6 +1023,18 @@ if test "x$with_linux_input_header" != "x"; then
> 	AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>])
> fi
> 
>+case "${HALD_BACKEND}" in
>+	linux)
>+		AC_CHECK_HEADERS(sys/inotify.h)
>+
>+		if test x"$ac_cv_header_sys_inotify_h" = x"no"; then
>+			AC_MSG_ERROR([cannot find inotify header (glibc >= 2.4 needed)])
>+		fi
>+	  ;;
>+	*)
>+	  ;;
>+esac
>+
> dnl
> dnl SUBSETTING END
> dnl
>diff --git a/hald/linux/Makefile.am b/hald/linux/Makefile.am
>index 2b08c30..8908b76 100644
>--- a/hald/linux/Makefile.am
>+++ b/hald/linux/Makefile.am
>@@ -25,7 +25,6 @@ libhald_linux_la_SOURCES =				\
> 	coldplug.h		coldplug.c		\
> 	device.h		device.c		\
> 	blockdev.h		blockdev.c		\
>-	inotify_local.h					\
> 				hal-file-monitor.c
> 
> if HAVE_ACPI
>diff --git a/hald/linux/hal-file-monitor.c b/hald/linux/hal-file-monitor.c
>index c671ce4..e88fd8d 100644
>--- a/hald/linux/hal-file-monitor.c
>+++ b/hald/linux/hal-file-monitor.c
>@@ -29,11 +29,7 @@
> #include <string.h>
> #include <errno.h>
> 
>-#ifdef HAVE_SYS_INOTIFY_H
> #include <sys/inotify.h>
>-#else
>-#include "inotify_local.h"
>-#endif
> 
> #include <glib.h>
> #include <glib/gi18n.h>
>diff --git a/hald/linux/inotify_local.h b/hald/linux/inotify_local.h
>deleted file mode 100644
>index 337bd71..0000000
>--- a/hald/linux/inotify_local.h
>+++ /dev/null
>@@ -1,192 +0,0 @@
>-/*
>- * inotify_local.h - wrapping of libc features and kernel defines
>- *
>- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers at vrfy.org>
>- *
>- *	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 version 2 of the License.
>- * 
>- *	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.
>- *
>- */
>-
>-#ifndef _INOTIFY_LOCAL_H_
>-#define _INOTIFY_LOCAL_H_
>-
>-#include <string.h>
>-#include <unistd.h>
>-#include <stdint.h>
>-
>-/* needed until Inotify! syscalls reach glibc */
>-#include <sys/syscall.h>
>-#ifndef __NR_inotify_init
>-#if defined(__i386__)
>-# define __NR_inotify_init	291
>-# define __NR_inotify_add_watch	292
>-# define __NR_inotify_rm_watch	293
>-#elif defined(__x86_64__)
>-# define __NR_inotify_init	253
>-# define __NR_inotify_add_watch	254
>-# define __NR_inotify_rm_watch	255
>-#elif defined(__powerpc__) || defined(__powerpc64__)
>-# define __NR_inotify_init	275
>-# define __NR_inotify_add_watch	276
>-# define __NR_inotify_rm_watch	277
>-#elif defined (__ia64__)
>-# define __NR_inotify_init	1277
>-# define __NR_inotify_add_watch	1278
>-# define __NR_inotify_rm_watch	1279
>-#elif defined (__s390__)
>-# define __NR_inotify_init	284
>-# define __NR_inotify_add_watch	285
>-# define __NR_inotify_rm_watch	286
>-#elif defined (__mc68000__)
>-# define __NR_inotify_init	284
>-# define __NR_inotify_add_watch	285
>-# define __NR_inotify_rm_watch	286
>-#elif defined (__alpha__)
>-# define __NR_inotify_init	444
>-# define __NR_inotify_add_watch	445
>-# define __NR_inotify_rm_watch	446
>-#elif defined (__sparc__) || defined (__sparc64__)
>-# define __NR_inotify_init	151
>-# define __NR_inotify_add_watch	152
>-# define __NR_inotify_rm_watch	156
>-#elif defined (__arm__)
>-# define __NR_inotify_init	__NR_SYSCALL_BASE+316
>-# define __NR_inotify_add_watch	__NR_SYSCALL_BASE+317
>-# define __NR_inotify_rm_watch	__NR_SYSCALL_BASE+318
>-#elif defined (__sh__)
>-# define __NR_inotify_init	290
>-# define __NR_inotify_add_watch	291
>-# define __NR_inotify_rm_watch	292
>-#elif defined (__m32r__)
>-# define __NR_inotify_init      290
>-# define __NR_inotify_add_watch 291
>-# define __NR_inotify_rm_watch  292
>-#elif defined (__hppa__)
>-# define __NR_inotify_init      269
>-# define __NR_inotify_add_watch 270
>-# define __NR_inotify_rm_watch  271
>-#elif defined (__mips__)
>-# include <sgidefs.h>
>-# if _MIPS_SIM == _MIPS_SIM_ABI32
>-#  define __NR_Linux             4000
>-#  define __NR_inotify_init      (__NR_Linux + 284)
>-#  define __NR_inotify_add_watch (__NR_Linux + 285)
>-#  define __NR_inotify_rm_watch  (__NR_Linux + 286)
>-# elif _MIPS_SIM == _MIPS_SIM_ABI64
>-#  define __NR_Linux             5000
>-#  define __NR_inotify_init      (__NR_Linux + 243)
>-#  define __NR_inotify_add_watch (__NR_Linux + 244)
>-#  define __NR_inotify_rm_watch  (__NR_Linux + 245)
>-# elif _MIPS_SIM == _MIPS_SIM_NABI32
>-#  define __NR_Linux             6000
>-#  define __NR_inotify_init      (__NR_Linux + 247)
>-#  define __NR_inotify_add_watch (__NR_Linux + 248)
>-#  define __NR_inotify_rm_watch  (__NR_Linux + 249)
>-# endif
>-#else
>-# warning "inotify unsupported on this architecture!"
>-#endif
>-#endif /* __NR_inotify_init */
>-
>-/* dummy if we don't have the syscalls defined */
>-#ifndef __NR_inotify_init
>-static inline int inotify_init(void)
>-{
>-	return -1;
>-}
>-
>-static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
>-{
>-	return -1;
>-}
>-
>-static inline int inotify_rm_watch(int fd, uint32_t wd)
>-{
>-	return -1;
>-}
>-#else
>-static inline int inotify_init(void)
>-{
>-	return syscall(__NR_inotify_init);
>-}
>-
>-static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
>-{
>-	return syscall(__NR_inotify_add_watch, fd, name, mask);
>-}
>-
>-static inline int inotify_rm_watch(int fd, uint32_t wd)
>-{
>-	return syscall(__NR_inotify_rm_watch, fd, wd);
>-}
>-#endif /* __NR_inotify_init */
>-
>-#ifndef IN_CREATE
>-#define IN_CREATE		0x00000100	/* Subfile was created */
>-#define IN_MOVED_FROM		0x00000040	/* File was moved from X */
>-#define IN_MOVED_TO		0x00000080	/* File was moved to Y */
>-#define IN_DELETE		0x00000200	/* Subfile was deleted */
>-#define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
>-#define IN_MOVE			(IN_MOVED_FROM | IN_MOVED_TO) /* moves */
>-#endif /* IN_CREATE */
>-
>-struct inotify_event {
>-	int      wd;
>-	uint32_t mask;
>-	uint32_t cookie;
>-	uint32_t len;
>-	char     name[];
>-};
>-
>-/* the following are legal, implemented events that user-space can watch for */
>-#define IN_ACCESS		0x00000001	/* File was accessed */
>-#define IN_MODIFY		0x00000002	/* File was modified */
>-#define IN_ATTRIB		0x00000004	/* Metadata changed */
>-#define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
>-#define IN_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */
>-#define IN_OPEN			0x00000020	/* File was opened */
>-#define IN_MOVED_FROM		0x00000040	/* File was moved from X */
>-#define IN_MOVED_TO		0x00000080	/* File was moved to Y */
>-#define IN_CREATE		0x00000100	/* Subfile was created */
>-#define IN_DELETE		0x00000200	/* Subfile was deleted */
>-#define IN_DELETE_SELF		0x00000400	/* Self was deleted */
>-#define IN_MOVE_SELF		0x00000800	/* Self was moved */
>-
>-/* the following are legal events.  they are sent as needed to any watch */
>-#define IN_UNMOUNT		0x00002000	/* Backing fs was unmounted */
>-#define IN_Q_OVERFLOW		0x00004000	/* Event queued overflowed */
>-#define IN_IGNORED		0x00008000	/* File was ignored */
>-
>-/* helper events */
>-#define IN_CLOSE		(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
>-#define IN_MOVE			(IN_MOVED_FROM | IN_MOVED_TO) /* moves */
>-
>-/* special flags */
>-#define IN_ONLYDIR		0x01000000	/* only watch the path if it is a directory */
>-#define IN_DONT_FOLLOW		0x02000000	/* don't follow a sym link */
>-#define IN_MASK_ADD		0x20000000	/* add to the mask of an already existing watch */
>-#define IN_ISDIR		0x40000000	/* event occurred against dir */
>-#define IN_ONESHOT		0x80000000	/* only send event once */
>-
>-/*
>- * All of the events - we build the list by hand so that we can add flags in
>- * the future and not break backward compatibility.  Apps will get only the
>- * events that they originally wanted.  Be sure to add new events here!
>- */
>-#define IN_ALL_EVENTS	(IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
>-			 IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
>-			 IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
>-			 IN_MOVE_SELF)
>-
>-#endif /* _INOTIFY_LOCAL_H_ */

Actions: View | Splinter Review

Attachments on bug 17696: 19068

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.