fixups to get back to proper patch order

Damm, it's hard to merge a multi-line tree into one flat line at times...

diff --git a/test/udev-test.pl b/test/udev-test.pl
index c2d8e27a52003ca25e6186a52d6e78b546061b70..d584579584ba2b7bb7606ba2ebaed0d32ba26d93 100644 (file)
--- 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";
 
 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 = (
        {
 
 my @tests = (
        {


@@ -1262,6 +1259,7 @@ sub run_test {
 
 
        udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
 
 
        udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});

+

        if ((-e "$PWD/$udev_root$config->{exp_name}") ||
            (-l "$PWD/$udev_root$config->{exp_name}")) {
 
        if ((-e "$PWD/$udev_root$config->{exp_name}") ||
            (-l "$PWD/$udev_root$config->{exp_name}")) {
 

diff --git a/udev.c b/udev.c
index 5ad7e425e6fc212433148a52b16489aca28afc4d..35fa533a4e76d6f49747cd9c12b7dd9d7ef596af 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -108,7 +108,6 @@ int main(int argc, char *argv[], char *envp[])
        udev_init_config();
 
        /* set signal handlers */
        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;
        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);
 
                        /* 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);
                        /* 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 6e6b9aeb3ed572e1b398ca0605f9845c8c4736fd..fe847b875f0d08406db8bdf1544e62f952fd2f7d 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -401,7 +401,7 @@ print:
                        break;
 
                case PATH:
                        break;
 
                case PATH:

-                       strfieldcpy(result, udev.devpath);
+                       strfieldcpy(result, path);

                        break;
 
                case ALL:
                        break;
 
                case ALL: