summaryrefslogtreecommitdiff
path: root/udev.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-02-26 19:40:40 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:32:30 -0700
commit3fe0734266becd2ebcb111b07c3e17b2a9780477 (patch)
tree4d1d6e600380bdc300b0c1db1dfc707e0ba12f05 /udev.c
parente964c2c05d3d6e2bdb21b3461ed7a4e85315cbc1 (diff)
[PATCH] udev - safer string handling - part four
Mainly a cleanup of the earlier patches with a few missing pieces and some cosmetical changes. I've moved the udev_init_config() to very early init, otherwise we don't get any logging for the processing of the input. What would I do without gdb :) Greg, it's the 7th patch in your box to apply. I will stop now and wait for you :)
Diffstat (limited to 'udev.c')
-rw-r--r--udev.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/udev.c b/udev.c
index 4486707f42..4ae4684536 100644
--- a/udev.c
+++ b/udev.c
@@ -41,7 +41,7 @@ char **main_envp;
#ifdef LOG
unsigned char logname[42];
-void log_message (int level, const char *format, ...)
+void log_message(int level, const char *format, ...)
{
va_list args;
@@ -76,7 +76,7 @@ static char *subsystem_blacklist[] = {
"",
};
-static int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
{
char *action;
char *devpath;
@@ -106,7 +106,7 @@ static int udev_hotplug(int argc, char **argv)
}
/* skip blacklisted subsystems */
- subsystem = get_subsystem(argv[1]);
+ subsystem = get_subsystem(main_argv[1]);
if (!subsystem) {
dbg("no subsystem?");
goto exit;
@@ -123,9 +123,6 @@ static int udev_hotplug(int argc, char **argv)
/* 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) {
@@ -172,7 +169,11 @@ int main(int argc, char **argv, char **envp)
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();
}