summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/udev-test.pl4
-rw-r--r--udev.c1
-rw-r--r--udevinfo.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 593e34e885..3f9a848490 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -35,6 +35,9 @@ my $perm = "udev.permissions";
my $main_conf = "udev-test.conf";
my $conf_tmp = "udev-test.rules";
+# uncomment following line to run udev with valgrind.
+# Should make this a runtime option to the script someday...
+#my $udev_bin = "valgrind --tool=memcheck --leak-check=yes ../udev";
my @tests = (
{
@@ -1260,7 +1263,6 @@ sub run_test {
udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
-
if ((-e "$PWD/$udev_root$config->{exp_name}") ||
(-l "$PWD/$udev_root$config->{exp_name}")) {
diff --git a/udev.c b/udev.c
index a9da014ea6..cf66e7cc89 100644
--- a/udev.c
+++ b/udev.c
@@ -118,6 +118,7 @@ int main(int argc, char *argv[], char *envp[])
udev_init_config();
/* set signal handlers */
+ memset(&act, 0x00, sizeof(act));
act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
diff --git a/udevinfo.c b/udevinfo.c
index ce9804e216..116aedbc21 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -401,7 +401,7 @@ print:
break;
case PATH:
- strfieldcpy(result, path);
+ strfieldcpy(result, udev.devpath);
break;
case ALL: