From 18ebc4305034401648e343b27981ef1badafef1c Mon Sep 17 00:00:00 2001
From: Greg KH <greg@press.(none)>
Date: Tue, 26 Apr 2005 23:15:56 -0700
Subject: [PATCH] bleah, more merge fixes...

---
 test/udev-test.pl | 4 +++-
 udev.c            | 1 +
 udevinfo.c        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 593e34e8..3f9a8484 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 a9da014e..cf66e7cc 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 ce9804e2..116aedbc 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:
-- 
2.39.5