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] remove udev_lib dependency from udevsend, which makes it smaller
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index 12fbe1725f07eb29e420f572b581821c94ce616f..43f3f0324b79cdf309c1be3939042a0dbce4c78d 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-43,6
+43,9
@@
#include "udevd.h"
#include "logging.h"
#include "udevd.h"
#include "logging.h"
+/* global variables*/
+static int udevsendsock;
+
static int pipefds[2];
static unsigned long long expected_seqnum = 0;
static volatile int sigchilds_waiting;
static int pipefds[2];
static unsigned long long expected_seqnum = 0;
static volatile int sigchilds_waiting;
@@
-127,6
+130,7
@@
static void udev_run(struct hotplug_msg *msg)
switch (pid) {
case 0:
/* child */
switch (pid) {
case 0:
/* child */
+ close(udevsendsock);
execle(udev_bin, "udev", msg->subsystem, NULL, msg->envp);
dbg("exec of child failed");
_exit(1);
execle(udev_bin, "udev", msg->subsystem, NULL, msg->envp);
dbg("exec of child failed");
_exit(1);
@@
-397,7
+401,7
@@
static void user_sighandler(void)
int main(int argc, char *argv[], char *envp[])
{
int main(int argc, char *argv[], char *envp[])
{
- int
ssock,
maxsockplus;
+ int maxsockplus;
struct sockaddr_un saddr;
socklen_t addrlen;
int retval, fd;
struct sockaddr_un saddr;
socklen_t addrlen;
int retval, fd;
@@
-476,28
+480,21
@@
int main(int argc, char *argv[], char *envp[])
strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
-
s
sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
- if (
s
sock == -1) {
+
udevsend
sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (
udevsend
sock == -1) {
dbg("error getting socket, exit");
exit(1);
}
dbg("error getting socket, exit");
exit(1);
}
- set_cloexec_flag(ssock, 1);
-
/* the bind takes care of ensuring only one copy running */
/* the bind takes care of ensuring only one copy running */
- retval = bind(
s
sock, (struct sockaddr *) &saddr, addrlen);
+ retval = bind(
udevsend
sock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
dbg("bind failed, exit");
goto exit;
}
if (retval < 0) {
dbg("bind failed, exit");
goto exit;
}
- retval = fcntl(ssock, F_SETFD, FD_CLOEXEC);
- if (retval < 0) {
- dbg("error fcntl on ssock: %s", strerror(errno));
- exit(1);
- }
/* enable receiving of the sender credentials */
/* enable receiving of the sender credentials */
- setsockopt(
s
sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
+ setsockopt(
udevsend
sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
/* possible override of udev binary, used for testing */
udev_bin = getenv("UDEV_BIN");
/* possible override of udev binary, used for testing */
udev_bin = getenv("UDEV_BIN");
@@
-507,9
+504,9
@@
int main(int argc, char *argv[], char *envp[])
udev_bin = UDEV_BIN;
FD_ZERO(&readfds);
udev_bin = UDEV_BIN;
FD_ZERO(&readfds);
- FD_SET(
s
sock, &readfds);
+ FD_SET(
udevsend
sock, &readfds);
FD_SET(pipefds[0], &readfds);
FD_SET(pipefds[0], &readfds);
- maxsockplus =
s
sock+1;
+ maxsockplus =
udevsend
sock+1;
while (1) {
fd_set workreadfds = readfds;
retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
while (1) {
fd_set workreadfds = readfds;
retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
@@
-520,8
+517,8
@@
int main(int argc, char *argv[], char *envp[])
continue;
}
continue;
}
- if (FD_ISSET(
s
sock, &workreadfds))
- handle_udevsend_msg(
s
sock);
+ if (FD_ISSET(
udevsend
sock, &workreadfds))
+ handle_udevsend_msg(
udevsend
sock);
if (FD_ISSET(pipefds[0], &workreadfds))
user_sighandler();
if (FD_ISSET(pipefds[0], &workreadfds))
user_sighandler();
@@
-548,7
+545,7
@@
int main(int argc, char *argv[], char *envp[])
}
}
exit:
}
}
exit:
- close(
s
sock);
+ close(
udevsend
sock);
logging_close();
return 1;
}
logging_close();
return 1;
}