#include <string.h>
#include "device-private.h"
-#include "libudev-device-internal.h"
#include "string-util.h"
#include "strv.h"
#include "udev-builtin.h"
return UDEV_BUILTIN_MAX;
}
-int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) {
+int udev_builtin_run(sd_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) {
_cleanup_strv_free_ char **argv = NULL;
if (!builtins[cmd])
/* we need '0' here to reset the internal state */
optind = 0;
- return builtins[cmd]->cmd(dev->device, strv_length(argv), argv, test);
+ return builtins[cmd]->cmd(dev, strv_length(argv), argv, test);
}
int udev_builtin_add_property(sd_device *dev, bool test, const char *key, const char *val) {
#include "sd-device.h"
-#include "libudev.h"
-
enum udev_builtin_cmd {
#if HAVE_BLKID
UDEV_BUILTIN_BLKID,
enum udev_builtin_cmd udev_builtin_lookup(const char *command);
const char *udev_builtin_name(enum udev_builtin_cmd cmd);
bool udev_builtin_run_once(enum udev_builtin_cmd cmd);
-int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test);
+int udev_builtin_run(sd_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test);
void udev_builtin_list(void);
bool udev_builtin_validate(void);
int udev_builtin_add_property(sd_device *dev, bool test, const char *key, const char *val);
udev_event_apply_format(event, cmd, command, sizeof(command), false);
if (builtin_cmd < UDEV_BUILTIN_MAX)
- udev_builtin_run(event->dev, builtin_cmd, command, false);
+ udev_builtin_run(event->dev->device, builtin_cmd, command, false);
else {
if (event->exec_delay > 0) {
log_debug("delay execution of '%s'", command);
#include "fileio.h"
#include "fs-util.h"
#include "glob-util.h"
+#include "libudev-device-internal.h"
#include "path-util.h"
#include "proc-cmdline.h"
#include "stat-util.h"
rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
- if (udev_builtin_run(event->dev, cur->key.builtin_cmd, command, false) != 0) {
+ if (udev_builtin_run(event->dev->device, cur->key.builtin_cmd, command, false) != 0) {
/* remember failure */
log_debug("IMPORT builtin '%s' returned non-zero",
udev_builtin_name(cur->key.builtin_cmd));
#include <stdio.h>
#include <stdlib.h>
+#include "libudev-device-internal.h"
#include "libudev-private.h"
#include "path-util.h"
#include "string-util.h"
goto finish;
}
- r = udev_builtin_run(dev, cmd, arg_command, true);
+ r = udev_builtin_run(dev->device, cmd, arg_command, true);
if (r < 0)
log_debug("error executing '%s', exit code %i", arg_command, r);