From 587751eb663c8c52133d9a90a6bc8b7b84bdfcc6 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Feb 2016 12:15:17 -0500
Subject: udev-test.pl: add --strace option

It's useful when trying to see what the tests are doing.
I hardcoded '-efile' as the option to strace, but in the future
it might be useful to make this configurable.
---
 test/udev-test.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 638c3e8f4e..b047493f6b 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -23,8 +23,10 @@ use strict;
 my $udev_bin            = "./test-udev";
 my $valgrind            = 0;
 my $gdb                 = 0;
+my $strace              = 0;
 my $udev_bin_valgrind   = "valgrind --tool=memcheck --leak-check=yes --track-origins=yes --quiet $udev_bin";
 my $udev_bin_gdb        = "gdb --args $udev_bin";
+my $udev_bin_strace     = "strace -efile $udev_bin";
 my $udev_dev            = "test/dev";
 my $udev_run            = "test/run";
 my $udev_rules_dir      = "$udev_run/udev/rules.d";
@@ -1330,6 +1332,8 @@ sub udev {
                 system("$udev_bin_valgrind $action $devpath");
         } elsif ($gdb > 0) {
                 system("$udev_bin_gdb $action $devpath");
+        } elsif ($strace > 0) {
+                system("$udev_bin_strace $action $devpath");
         } else {
                 system("$udev_bin", "$action", "$devpath");
         }
@@ -1509,6 +1513,9 @@ foreach my $arg (@ARGV) {
         } elsif ($arg =~ m/--gdb/) {
                 $gdb = 1;
                 printf("using gdb\n");
+        } elsif ($arg =~ m/--strace/) {
+                $strace = 1;
+                printf("using strace\n");
         } else {
                 push(@list, $arg);
         }
-- 
cgit v1.2.3-54-g00ecf


From 916a8d4341cc2d188614fee011346f2df8daf86c Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Feb 2016 12:17:08 -0500
Subject: udev-rules: fix querying of attributes

faccessat returns 0 on success.

A cosmetic fix is also included: the slash was doubled unnecessarily.
---
 src/udev/udev-rules.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 8470456d4c..475856db6f 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -705,10 +705,10 @@ static void attr_subst_subdir(char *attr, size_t len) {
 
         for (dent = readdir(dir); dent != NULL; dent = readdir(dir))
                 if (dent->d_name[0] != '.') {
-                        char n[strlen(dent->d_name) + 1 + strlen(tail) + 1];
+                        char n[strlen(dent->d_name) + strlen(tail) + 1];
 
-                        strscpyl(n, sizeof n, dent->d_name, "/", tail, NULL);
-                        if (faccessat(dirfd(dir), n, F_OK, 0)) {
+                        strscpyl(n, sizeof n, dent->d_name, tail, NULL);
+                        if (faccessat(dirfd(dir), n, F_OK, 0) == 0) {
                                 strscpyl(attr, len, path, n, NULL);
                                 break;
                         }
-- 
cgit v1.2.3-54-g00ecf