chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] klibc: use klcc wrapper instead of our own Makefile
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index bd21f156146e7bc0162901f11d394a23c3948fad..2cd3622ce011a5a04630ff8d05595dbd6d53fc81 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-1,7
+1,7
@@
/*
* udevd.c - hotplug event serializer
*
/*
* udevd.c - hotplug event serializer
*
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004
-2005
Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
*
*
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
*
*
@@
-21,7
+21,6
@@
*/
#include <stddef.h>
*/
#include <stddef.h>
-#include <sys/wait.h>
#include <signal.h>
#include <unistd.h>
#include <errno.h>
#include <signal.h>
#include <unistd.h>
#include <errno.h>
@@
-31,6
+30,8
@@
#include <ctype.h>
#include <dirent.h>
#include <fcntl.h>
#include <ctype.h>
#include <dirent.h>
#include <fcntl.h>
+#include <sys/select.h>
+#include <sys/wait.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
@@
-39,6
+40,7
@@
#include <sys/stat.h>
#include "list.h"
#include <sys/stat.h>
#include "list.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_utils.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_utils.h"
@@
-67,7
+69,7
@@
static void user_sighandler(void);
static void reap_sigchilds(void);
char *udev_bin;
static void reap_sigchilds(void);
char *udev_bin;
-#ifdef LOG
+#ifdef
USE_
LOG
void log_message (int level, const char *format, ...)
{
va_list args;
void log_message (int level, const char *format, ...)
{
va_list args;
@@
-262,7
+264,7
@@
static int compare_devpath(const char *running, const char *waiting)
{
int i;
{
int i;
- for (i = 0; i <
DEV
PATH_SIZE; i++) {
+ for (i = 0; i < PATH_SIZE; i++) {
/* identical device event found */
if (running[i] == '\0' && waiting[i] == '\0')
return 1;
/* identical device event found */
if (running[i] == '\0' && waiting[i] == '\0')
return 1;