[PATCH] udevinfo symlink reverse query

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index b94376c9cee22131d7348f4f837982efc7bbe021..01c2a2a8ae646a6cd0d19e67a8052f2816cf5393 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -73,7 +73,7 @@ static int print_all_attributes(const char *path)
 
        dlist_for_each_data(attributes, attr, struct sysfs_attribute) {
                if (attr->value != NULL) {
-                       strncpy(value, attr->value, SYSFS_VALUE_MAX);
+                       strfieldcpy(value, attr->value);
                        len = strlen(value);
                        if (len == 0)
                                continue;
@@ -122,7 +122,8 @@ enum query_type {
        SYMLINK,
        MODE,
        OWNER,
-       GROUP
+       GROUP,
+       ALL
 };
 
 static int print_device_chain(const char *path)
@@ -258,6 +259,11 @@ static int process_options(void)
                                break;
                        }
 
+                       if (strcmp(optarg, "all") == 0) {
+                               query = ALL;
+                               break;
+                       }
+
                        printf("unknown query type\n");
                        exit(1);
 
@@ -306,8 +312,8 @@ static int process_options(void)
                        } else {
                                if (path[0] != '/') {
                                        /* prepend '/' if missing */
-                                       strcat(temp, "/");
-                                       strncat(temp, path, sizeof(path));
+                                       strfieldcat(temp, "/");
+                                       strfieldcat(temp, path);
                                        pos = temp;
                                } else {
                                        pos = path;
@@ -343,7 +349,7 @@ print:
                case NAME:
                        if (root)
                                strfieldcpy(result, udev_root);
-                       strncat(result, dev.name, sizeof(result));
+                       strfieldcat(result, dev.name);
                        break;
 
                case SYMLINK:
@@ -366,6 +372,10 @@ print:
                        strfieldcpy(result, path);
                        break;
 
+               case ALL:
+                       print_record(path, &dev);
+                       goto exit;
+
                default:
                        goto exit;
                }
@@ -385,7 +395,7 @@ exit:
                                /* prepend sysfs mountpoint if not given */
                                strfieldcpy(temp, path);
                                strfieldcpy(path, sysfs_path);
-                               strncat(path, temp, sizeof(path));
+                               strfieldcat(path, temp);
                        }
                        print_device_chain(path);
                        return 0;
@@ -406,8 +416,10 @@ help:
               "             'owner'   of node\n"
               "             'group'   of node\n"
               "             'path'    sysfs device path\n"
+              "             'all'     all values\n"
+              "\n"
               "  -p PATH  sysfs device path used for query or chain\n"
-              "  -n NAME  node name used for query\n"
+              "  -n NAME  node/symlink name used for query\n"
               "\n"
               "  -r       print udev root\n"
               "  -a       print all SYSFS_attributes along the device chain\n"