X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=2832ea0ee368677ca7325384bb7655108c7fd980;hp=e7225c883108ed609e9b69ffb6448f1628822969;hb=c48622cc25bad59aadb9f8e1d66c6ed5fb85cbe0;hpb=64e0ce85de834bfd442228c18fe602d1d988064b

diff --git a/udevinfo.c b/udevinfo.c
index e7225c883..2832ea0ee 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -26,6 +26,8 @@
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "udev.h"
 
@@ -56,10 +58,23 @@ static void print_all_attributes(const char *devpath, const char *key)
 	dir = opendir(path);
 	if (dir != NULL) {
 		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+			struct stat statbuf;
+			char filename[PATH_SIZE];
 			char *attr_value;
 			char value[NAME_SIZE];
 			size_t len;
 
+			if (dent->d_name[0] == '.')
+				continue;
+
+			strlcpy(filename, path, sizeof(filename));
+			strlcat(filename, "/", sizeof(filename));
+			strlcat(filename, dent->d_name, sizeof(filename));
+			if (lstat(filename, &statbuf) != 0)
+				continue;
+			if (S_ISLNK(statbuf.st_mode))
+				continue;
+
 			attr_value = sysfs_attr_get_value(devpath, dent->d_name);
 			if (attr_value == NULL)
 				continue;
@@ -89,6 +104,10 @@ static int print_device_chain(const char *devpath)
 {
 	struct sysfs_device *dev;
 
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL)
+		return -1;
+
 	printf("\n"
 	       "Udevinfo starts with the device specified by the devpath and then\n"
 	       "walks up the chain of parent devices. It prints for every device\n"
@@ -97,10 +116,6 @@ static int print_device_chain(const char *devpath)
 	       "and the attributes from one single parent device.\n"
 	       "\n");
 
-	dev = sysfs_device_get(devpath);
-	if (dev == NULL)
-		return -1;
-
 	printf("  looking at device '%s':\n", dev->devpath);
 	printf("    KERNEL==\"%s\"\n", dev->kernel);
 	printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);
@@ -362,7 +377,11 @@ int main(int argc, char *argv[], char *envp[])
 		break;
 	case ACTION_ATTRIBUTE_WALK:
 		if (path[0] != '\0') {
-			print_device_chain(path);
+			if (print_device_chain(path) != 0) {
+				fprintf(stderr, "device not found\n");
+				rc = 4;
+				goto exit;
+			}
 		} else if (name[0] != '\0') {
 			char devpath[PATH_SIZE];
 
@@ -371,7 +390,11 @@ int main(int argc, char *argv[], char *envp[])
 				rc = 4;
 				goto exit;
 			}
-			print_device_chain(devpath);
+			if (print_device_chain(devpath) != 0) {
+				fprintf(stderr, "device not found\n");
+				rc = 4;
+				goto exit;
+			}
 		} else {
 			fprintf(stderr, "attribute walk needs --path or node --name specified\n");
 			rc = 5;