chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted format fixes
[elogind.git]
/
src
/
udev
/
udev-event.c
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index 5585b78cc34cd96d5834a5129ec84137d20b16ef..beb09439c75ad27fa9ecf1bed00706d4dec80ee4 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-218,14
+218,14
@@
subst:
case SUBST_MAJOR: {
char num[UTIL_PATH_SIZE];
case SUBST_MAJOR: {
char num[UTIL_PATH_SIZE];
- sprintf(num, "%
d
", major(udev_device_get_devnum(dev)));
+ sprintf(num, "%
u
", major(udev_device_get_devnum(dev)));
l = strpcpy(&s, l, num);
break;
}
case SUBST_MINOR: {
char num[UTIL_PATH_SIZE];
l = strpcpy(&s, l, num);
break;
}
case SUBST_MINOR: {
char num[UTIL_PATH_SIZE];
- sprintf(num, "%
d
", minor(udev_device_get_devnum(dev)));
+ sprintf(num, "%
u
", minor(udev_device_get_devnum(dev)));
l = strpcpy(&s, l, num);
break;
}
l = strpcpy(&s, l, num);
break;
}
@@
-387,7
+387,7
@@
static int spawn_exec(struct udev_event *event,
if (fd_stderr < 0)
dup2(fd, STDERR_FILENO);
} else
if (fd_stderr < 0)
dup2(fd, STDERR_FILENO);
} else
- log_error
(
"open /dev/null failed: %m");
+ log_error
_errno(errno,
"open /dev/null failed: %m");
/* connect pipes to std{out,err} */
if (fd_stdout >= 0) {
/* connect pipes to std{out,err} */
if (fd_stdout >= 0) {
@@
-409,7
+409,7
@@
static int spawn_exec(struct udev_event *event,
execve(argv[0], argv, envp);
/* exec failed */
execve(argv[0], argv, envp);
/* exec failed */
- log_error
(
"failed to execute '%s' '%s': %m", argv[0], cmd);
+ log_error
_errno(errno,
"failed to execute '%s' '%s': %m", argv[0], cmd);
return -errno;
}
return -errno;
}
@@
-437,14
+437,14
@@
static void spawn_read(struct udev_event *event,
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- log_error
(
"error creating epoll fd: %m");
+ log_error
_errno(errno,
"error creating epoll fd: %m");
return;
}
if (fd_stdout >= 0) {
r = epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_stdout, &ep_outpipe);
if (r < 0) {
return;
}
if (fd_stdout >= 0) {
r = epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_stdout, &ep_outpipe);
if (r < 0) {
- log_error
(
"fail to add stdout fd to epoll: %m");
+ log_error
_errno(errno,
"fail to add stdout fd to epoll: %m");
return;
}
}
return;
}
}
@@
-452,7
+452,7
@@
static void spawn_read(struct udev_event *event,
if (fd_stderr >= 0) {
r = epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_stderr, &ep_errpipe);
if (r < 0) {
if (fd_stderr >= 0) {
r = epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_stderr, &ep_errpipe);
if (r < 0) {
- log_error
(
"fail to add stderr fd to epoll: %m");
+ log_error
_errno(errno,
"fail to add stderr fd to epoll: %m");
return;
}
}
return;
}
}
@@
-481,7
+481,7
@@
static void spawn_read(struct udev_event *event,
if (fdcount < 0) {
if (errno == EINTR)
continue;
if (fdcount < 0) {
if (errno == EINTR)
continue;
- log_error
(
"failed to poll: %m");
+ log_error
_errno(errno,
"failed to poll: %m");
return;
} else if (fdcount == 0) {
log_error("timeout '%s'", cmd);
return;
} else if (fdcount == 0) {
log_error("timeout '%s'", cmd);
@@
-509,7
+509,7
@@
static void spawn_read(struct udev_event *event,
memcpy(&result[respos], buf, count);
respos += count;
} else {
memcpy(&result[respos], buf, count);
respos += count;
} else {
- log_error("'%s' ressize %z
d
too short", cmd, ressize);
+ log_error("'%s' ressize %z
u
too short", cmd, ressize);
}
}
}
}
@@
-527,7
+527,7
@@
static void spawn_read(struct udev_event *event,
} else if (ev[i].events & EPOLLHUP) {
r = epoll_ctl(fd_ep, EPOLL_CTL_DEL, *fd, NULL);
if (r < 0) {
} else if (ev[i].events & EPOLLHUP) {
r = epoll_ctl(fd_ep, EPOLL_CTL_DEL, *fd, NULL);
if (r < 0) {
- log_error
(
"failed to remove fd from epoll: %m");
+ log_error
_errno(errno,
"failed to remove fd from epoll: %m");
return;
}
*fd = -1;
return;
}
*fd = -1;
@@
-576,22
+576,22
@@
static int spawn_wait(struct udev_event *event,
if (errno == EINTR)
continue;
err = -errno;
if (errno == EINTR)
continue;
err = -errno;
- log_error
(
"failed to poll: %m");
+ log_error
_errno(errno,
"failed to poll: %m");
goto out;
}
if (fdcount == 0) {
goto out;
}
if (fdcount == 0) {
- log_warning("slow: '%s' [
%u
]", cmd, pid);
+ log_warning("slow: '%s' [
"PID_FMT"
]", cmd, pid);
fdcount = poll(pfd, 1, timeout);
if (fdcount < 0) {
if (errno == EINTR)
continue;
err = -errno;
fdcount = poll(pfd, 1, timeout);
if (fdcount < 0) {
if (errno == EINTR)
continue;
err = -errno;
- log_error
(
"failed to poll: %m");
+ log_error
_errno(errno,
"failed to poll: %m");
goto out;
}
if (fdcount == 0) {
goto out;
}
if (fdcount == 0) {
- log_error("timeout: killing '%s' [
%u
]", cmd, pid);
+ log_error("timeout: killing '%s' [
"PID_FMT"
]", cmd, pid);
kill(pid, SIGKILL);
}
}
kill(pid, SIGKILL);
}
}
@@
-613,20
+613,20
@@
static int spawn_wait(struct udev_event *event,
if (waitpid(pid, &status, WNOHANG) < 0)
break;
if (WIFEXITED(status)) {
if (waitpid(pid, &status, WNOHANG) < 0)
break;
if (WIFEXITED(status)) {
- log_debug("'%s' [
%u
] exit with return code %i", cmd, pid, WEXITSTATUS(status));
+ log_debug("'%s' [
"PID_FMT"
] exit with return code %i", cmd, pid, WEXITSTATUS(status));
if (WEXITSTATUS(status) != 0)
err = -1;
} else if (WIFSIGNALED(status)) {
if (WEXITSTATUS(status) != 0)
err = -1;
} else if (WIFSIGNALED(status)) {
- log_error("'%s' [
%u
] terminated by signal %i (%s)", cmd, pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ log_error("'%s' [
"PID_FMT"
] terminated by signal %i (%s)", cmd, pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
err = -1;
} else if (WIFSTOPPED(status)) {
err = -1;
} else if (WIFSTOPPED(status)) {
- log_error("'%s' [
%u
] stopped", cmd, pid);
+ log_error("'%s' [
"PID_FMT"
] stopped", cmd, pid);
err = -1;
} else if (WIFCONTINUED(status)) {
err = -1;
} else if (WIFCONTINUED(status)) {
- log_error("'%s' [
%u
] continued", cmd, pid);
+ log_error("'%s' [
"PID_FMT"
] continued", cmd, pid);
err = -1;
} else {
err = -1;
} else {
- log_error("'%s' [
%u
] exit with status 0x%04x", cmd, pid, status);
+ log_error("'%s' [
"PID_FMT"
] exit with status 0x%04x", cmd, pid, status);
err = -1;
}
pid = 0;
err = -1;
}
pid = 0;
@@
-691,14
+691,14
@@
int udev_event_spawn(struct udev_event *event,
if (result != NULL || log_get_max_level() >= LOG_INFO) {
if (pipe2(outpipe, O_NONBLOCK) != 0) {
err = -errno;
if (result != NULL || log_get_max_level() >= LOG_INFO) {
if (pipe2(outpipe, O_NONBLOCK) != 0) {
err = -errno;
- log_error
(
"pipe failed: %m");
+ log_error
_errno(errno,
"pipe failed: %m");
goto out;
}
}
if (log_get_max_level() >= LOG_INFO) {
if (pipe2(errpipe, O_NONBLOCK) != 0) {
err = -errno;
goto out;
}
}
if (log_get_max_level() >= LOG_INFO) {
if (pipe2(errpipe, O_NONBLOCK) != 0) {
err = -errno;
- log_error
(
"pipe failed: %m");
+ log_error
_errno(errno,
"pipe failed: %m");
goto out;
}
}
goto out;
}
}
@@
-729,7
+729,7
@@
int udev_event_spawn(struct udev_event *event,
_exit(2 );
case -1:
_exit(2 );
case -1:
- log_error
(
"fork of '%s' failed: %m", cmd);
+ log_error
_errno(errno,
"fork of '%s' failed: %m", cmd);
err = -1;
goto out;
default:
err = -1;
goto out;
default:
@@
-775,21
+775,19
@@
static int rename_netif(struct udev_event *event) {
strscpy(name, IFNAMSIZ, event->name);
r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
strscpy(name, IFNAMSIZ, event->name);
r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
- if (r < 0) {
- log_error("error changing net interface name '%s' to '%s': %s",
- oldname, name, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Error changing net interface name '%s' to '%s': %m", oldname, name);
- log_debug("renamed network interface '%s' to '%s'
\n
", oldname, name);
+ log_debug("renamed network interface '%s' to '%s'", oldname, name);
return 0;
}
void udev_event_execute_rules(struct udev_event *event,
return 0;
}
void udev_event_execute_rules(struct udev_event *event,
- usec_t timeout_usec,
- usec_t timeout_warn_usec,
- struct udev_rules *rules, const sigset_t *sigmask) {
+ usec_t timeout_usec, usec_t timeout_warn_usec,
+ struct udev_list *properties_list,
+ struct udev_rules *rules,
+ const sigset_t *sigmask) {
struct udev_device *dev = event->dev;
if (udev_device_get_subsystem(dev) == NULL)
struct udev_device *dev = event->dev;
if (udev_device_get_subsystem(dev) == NULL)
@@
-803,7
+801,10
@@
void udev_event_execute_rules(struct udev_event *event,
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, dev);
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, dev);
- udev_rules_apply_to_event(rules, event, timeout_usec, timeout_warn_usec, sigmask);
+ udev_rules_apply_to_event(rules, event,
+ timeout_usec, timeout_warn_usec,
+ properties_list,
+ sigmask);
if (major(udev_device_get_devnum(dev)) != 0)
udev_node_remove(dev);
if (major(udev_device_get_devnum(dev)) != 0)
udev_node_remove(dev);
@@
-837,7
+838,10
@@
void udev_event_execute_rules(struct udev_event *event,
}
}
}
}
- udev_rules_apply_to_event(rules, event, timeout_usec, timeout_warn_usec, sigmask);
+ udev_rules_apply_to_event(rules, event,
+ timeout_usec, timeout_warn_usec,
+ properties_list,
+ sigmask);
/* rename a new network interface, if needed */
if (udev_device_get_ifindex(dev) > 0 && streq(udev_device_get_action(dev), "add") &&
/* rename a new network interface, if needed */
if (udev_device_get_ifindex(dev) > 0 && streq(udev_device_get_action(dev), "add") &&