chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created cdrom_id program to make it easier to determine cdrom types
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index 9242acce315ddd7c9ec9a21709f5751ccbf298d6..1575da8d5a3005c217f40431091a087bc6e59407 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-1,5
+1,5
@@
/*
/*
- * udevd.c -
hotplug event
serializer
+ * udevd.c -
event listener and
serializer
*
* Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
*
* Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
@@
-54,7
+54,7
@@
static int udevd_sock;
static int uevent_netlink_sock;
static pid_t sid;
static int uevent_netlink_sock;
static pid_t sid;
-static int pipefds[2];
+static int pipefds[2]
= {-1, -1}
;
static volatile int sigchilds_waiting;
static volatile int run_msg_q;
static volatile int sig_flag;
static volatile int sigchilds_waiting;
static volatile int run_msg_q;
static volatile int sig_flag;
@@
-843,11
+843,10
@@
int main(int argc, char *argv[], char *envp[])
/* Set fds to dev/null */
fd = open( "/dev/null", O_RDWR );
if (fd >= 0) {
/* Set fds to dev/null */
fd = open( "/dev/null", O_RDWR );
if (fd >= 0) {
- dup2(fd, 0);
- dup2(fd, 1);
- dup2(fd, 2);
- if (fd > 2)
- close(fd);
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ close(fd);
} else
err("error opening /dev/null %s", strerror(errno));
} else
err("error opening /dev/null %s", strerror(errno));
@@
-1012,6
+1011,11
@@
int main(int argc, char *argv[], char *envp[])
}
exit:
}
exit:
+ if (pipefds[0] > 0)
+ close(pipefds[0]);
+ if (pipefds[1] > 0)
+ close(pipefds[1]);
+
if (udevd_sock > 0)
close(udevd_sock);
if (udevd_sock > 0)
close(udevd_sock);