*
*/
+#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-#include <errno.h>
#include <ctype.h>
+#include <errno.h>
#include <signal.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
+#include "udev_lib.h"
#include "udev_version.h"
#include "udev_dbus.h"
#include "logging.h"
char **main_envp;
#ifdef LOG
-unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
{
va_list args;
"scsi_device",
"usb_host",
"pci_bus",
- "",
+ "pcmcia_socket",
+ ""
};
-static int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
{
char *action;
char *devpath;
}
/* skip blacklisted subsystems */
- subsystem = get_subsystem(argv[1]);
+ subsystem = get_subsystem(main_argv[1]);
if (!subsystem) {
dbg("no subsystem?");
goto exit;
/* connect to the system message bus */
sysbus_connect();
- /* initialize our configuration */
- udev_init_config();
-
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
- /* initialize the naming deamon */
- namedev_init();
-
- if (strcmp(action, "add") == 0)
+ if (strcmp(action, "add") == 0) {
+ namedev_init();
retval = udev_add_device(devpath, subsystem, 0);
-
- else if (strcmp(action, "remove") == 0)
- retval = udev_remove_device(devpath, subsystem);
-
- else {
- dbg("unknown action '%s'", action);
- retval = -EINVAL;
+ } else {
+ if (strcmp(action, "remove") == 0) {
+ retval = udev_remove_device(devpath, subsystem);
+ } else {
+ dbg("unknown action '%s'", action);
+ retval = -EINVAL;
+ }
}
+
udevdb_exit();
exit_sysbus:
return -retval;
}
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
{
main_argv = argv;
main_envp = envp;
init_logging("udev");
+
+ /* initialize our configuration */
+ udev_init_config();
+
dbg("version %s", UDEV_VERSION);
- return udev_hotplug(argc, argv);
+ return udev_hotplug();
}