diff options
| author | Greg KH <greg@press.(none)> | 2005-04-26 22:52:57 -0700 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 22:52:57 -0700 |
| commit | b1e95455d2683f43f47ea94a7b79af64f0738d36 (patch) | |
| tree | 4efb7211299e444bd18e323455e9715d5a643dee | |
| parent | 7757db1f859616171693ed9a54d1d16d3d5ed8e9 (diff) | |
fixups to get back to proper patch order
Damm, it's hard to merge a multi-line tree into one flat line at times...
| -rw-r--r-- | test/udev-test.pl | 4 | ||||
| -rw-r--r-- | udev.c | 5 | ||||
| -rw-r--r-- | udevinfo.c | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl index c2d8e27a52..d584579584 100644 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -35,9 +35,6 @@ 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 = ( { @@ -1262,6 +1259,7 @@ 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}")) { @@ -108,7 +108,6 @@ 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; @@ -193,10 +192,6 @@ int main(int argc, char *argv[], char *envp[]) /* get node from db, remove db-entry, delete created node */ retval = udev_remove_device(&udev); - /* Set the DEVNAME if known */ - if (udev.devname[0] != '\0') { - setenv("DEVNAME", udev.devname, 1); - } /* run dev.d/ scripts if we're not instructed to ignore the event */ if (udev_dev_d && udev.devname[0] != '\0') { setenv("DEVNAME", udev.devname, 1); diff --git a/udevinfo.c b/udevinfo.c index 6e6b9aeb3e..fe847b875f 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -401,7 +401,7 @@ print: break; case PATH: - strfieldcpy(result, udev.devpath); + strfieldcpy(result, path); break; case ALL: |