udevinfo: print error in --attribute-walk

diff --git a/udevinfo.c b/udevinfo.c
index 5445b0fcc13e0ad1e6463a9b8439490e0afada35..2832ea0ee368677ca7325384bb7655108c7fd980 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -104,6 +104,10 @@ static int print_device_chain(const char *devpath)
 {
        struct sysfs_device *dev;
 
 {
        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"
        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"


@@ -112,10 +116,6 @@ static int print_device_chain(const char *devpath)
               "and the attributes from one single parent device.\n"
               "\n");
 
               "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);
        printf("  looking at device '%s':\n", dev->devpath);
        printf("    KERNEL==\"%s\"\n", dev->kernel);
        printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);


@@ -377,7 +377,11 @@ int main(int argc, char *argv[], char *envp[])
                break;
        case ACTION_ATTRIBUTE_WALK:
                if (path[0] != '\0') {
                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];
 
                } else if (name[0] != '\0') {
                        char devpath[PATH_SIZE];
 


@@ -386,7 +390,11 @@ int main(int argc, char *argv[], char *envp[])
                                rc = 4;
                                goto exit;
                        }
                                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;
                } else {
                        fprintf(stderr, "attribute walk needs --path or node --name specified\n");
                        rc = 5;