#include <unistd.h>
#include <errno.h>
#include <ctype.h>
+#include <signal.h>
+#include <stdarg.h>
#include "udev.h"
#include "udev_version.h"
+#include "udev_dbus.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
char **main_argv;
char **main_envp;
+static void sig_handler(int signum)
+{
+ dbg("caught signal %d", signum);
+ switch (signum) {
+ case SIGINT:
+ case SIGTERM:
+ case SIGKILL:
+ sysbus_disconnect();
+ udevdb_exit();
+ exit(20 + signum);
+ break;
+ default:
+ dbg("unhandled signal");
+ }
+}
+
static inline char *get_action(void)
{
char *action;
return seqnum;
}
-#ifdef USE_DBUS
-
-/** Global variable for the connection the to system message bus or #NULL
- * if we cannot connect or acquire the org.kernel.udev service
- */
-DBusConnection* sysbus_connection;
-
-/** Disconnect from the system message bus */
-static void sysbus_disconnect()
+static inline int udev_user(int argc, char **argv)
{
- if (sysbus_connection == NULL)
- return;
+ static const char short_options[] = "q:rVh";
+ int option;
+ int retval = -EINVAL;
+ struct udevice dev;
+
+ while (1) {
+ option = getopt(argc, argv, short_options);
+ if (option == -1)
+ break;
+
+ dbg("option '%c'", option);
+ switch (option) {
+ case 'q':
+ dbg("udev query: %s\n", optarg);
+ retval = udevdb_open_ro();
+ if (retval != 0) {
+ printf("unable to open udev database\n");
+ return -1;
+ }
+ retval = udevdb_get_dev(optarg, &dev);
+ if (retval == 0) {
+ printf("%s\n", dev.name);
+ } else {
+ printf("device not found in udev database\n");
+ }
+ udevdb_exit();
+ return retval;
+
+ case 'r':
+ printf("%s\n", udev_root);
+ return 0;
+
+ case 'V':
+ printf("udev, version %s\n", UDEV_VERSION);
+ return 0;
+
+ case 'h':
+ retval = 0;
+ case '?':
+ default:
+ goto help;
+ }
+ }
- dbus_connection_disconnect(sysbus_connection);
- sysbus_connection = NULL;
-}
+help:
+ printf("Usage: [-qrVh]\n"
+ " -q <path> query database for the name of the created node\n"
+ " -r print udev root\n"
+ " -V print udev version\n"
+ " -h print this help text\n"
+ "\n");
-/** Connect to the system message bus */
-static void sysbus_connect()
-{
- DBusError error;
-
- /* Connect to a well-known bus instance, the system bus */
- dbus_error_init(&error);
- sysbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
- if (sysbus_connection == NULL) {
- dbg("cannot connect to system message bus, error %s: %s",
- error.name, error.message);
- dbus_error_free(&error);
- return;
- }
-
- /* Acquire the org.kernel.udev service such that listeners
- * know that the message is really from us and not from a
- * random attacker. See the file udev_sysbus_policy.conf for
- * details.
- *
- * Note that a service can have multiple owners (though there
- * is a concept of a primary owner for reception of messages)
- * so no race is introduced if two copies of udev is running
- * at the same time.
- */
- dbus_bus_acquire_service(sysbus_connection, "org.kernel.udev", 0,
- &error);
- if (dbus_error_is_set(&error)) {
- printf("cannot acquire org.kernel.udev service, error %s: %s'",
- error.name, error.message);
- sysbus_disconnect();
- return;
- }
+ return retval;
}
-#endif /* USE_DBUS */
-
-int main(int argc, char **argv, char **envp)
+static inline int udev_hotplug(int argc, char **argv)
{
char *action;
char *devpath;
char *subsystem;
int retval = -EINVAL;
-
- main_argv = argv;
- main_envp = envp;
-
- dbg("version %s", UDEV_VERSION);
-
- if (argc != 2) {
- dbg ("unknown number of arguments");
- goto exit;
- }
subsystem = argv[1];
goto exit;
}
- /* initialize our configuration */
- udev_init_config();
-
-#ifdef USE_DBUS
- /* connect to the system message bus */
- sysbus_connect();
-#endif /* USE_DBUS */
+ /* connect to the system message bus */
+ sysbus_connect();
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
dbg("unable to initialize database");
- goto exit;
+ goto exit_sysbus;
}
+ /* set up a default signal handler for now */
+ signal(SIGINT, sig_handler);
+ signal(SIGTERM, sig_handler);
+ signal(SIGKILL, sig_handler);
+
/* initialize the naming deamon */
namedev_init();
}
udevdb_exit();
-#ifdef USE_DBUS
- /* disconnect from the system message bus */
- sysbus_disconnect();
-#endif /* USE_DBUS */
+exit_sysbus:
+ /* disconnect from the system message bus */
+ sysbus_disconnect();
-exit:
+exit:
return retval;
}
+
+int main(int argc, char **argv, char **envp)
+{
+ main_argv = argv;
+ main_envp = envp;
+ int retval;
+
+ dbg("version %s", UDEV_VERSION);
+
+ /* initialize our configuration */
+ udev_init_config();
+
+ if (argc == 2 && argv[1][0] != '-') {
+ dbg("called by hotplug");
+ retval = udev_hotplug(argc, argv);
+ } else {
+ dbg("called by user");
+ retval = udev_user(argc, argv);
+ }
+
+ return retval;
+}
+
+
~ianmdlvl / elogind.git / blobdiff