X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=b23f9d0aef45fb5f29619be091bc6d1facaa2f5e;hp=defed2ee31a96e38aeaae3d0346323d2af778097;hb=c2818554cee064360b8a3ed543fe30349096a74a;hpb=c472e3c89b9aaad90ad6398c0d2ff5dcf5a9d238

diff --git a/udevinfo.c b/udevinfo.c
index defed2ee3..b23f9d0ae 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,6 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udevdb.h"
@@ -41,7 +42,7 @@ char **main_argv;
 int main_argc;
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
 	va_list	args;
@@ -111,6 +112,9 @@ static int print_record(char *path, struct udevice *dev)
 	printf("S: %s\n", dev->symlink);
 	printf("O: %s\n", dev->owner);
 	printf("G: %s\n", dev->group);
+	printf("F: %s\n", dev->config_file);
+	printf("L: %i\n", dev->config_line);
+	printf("T: %li\n", dev->config_time);
 	printf("\n");
 	return 0;
 }
@@ -122,7 +126,8 @@ enum query_type {
 	SYMLINK,
 	MODE,
 	OWNER,
-	GROUP
+	GROUP,
+	ALL
 };
 
 static int print_device_chain(const char *path)
@@ -133,6 +138,10 @@ static int print_device_chain(const char *path)
 	struct sysfs_device *sysfs_dev;
 	struct sysfs_device *sysfs_dev_parent;
 	int retval = 0;
+	char type;
+
+	type = get_device_type(path, "");
+	dbg("device type is %c", type);
 
 	/*  get the class dev */
 	class_dev = sysfs_open_class_device_path(path);
@@ -141,15 +150,23 @@ static int print_device_chain(const char *path)
 		return -1;
 	}
 
-	/* read the 'dev' file for major/minor*/
-	attr = sysfs_get_classdev_attr(class_dev, "dev");
-	if (attr == NULL) {
-		printf("couldn't get the \"dev\" file\n");
-		retval = -1;
-		goto exit;
+	printf("\nudevinfo starts with the device the node belongs to and then walks up the\n"
+	       "device chain, to print for every device found, all possibly useful attributes\n"
+	       "in the udev key format.\n"
+	       "Only attributes within one device section may be used together in one rule,\n"
+	       "to match the device for which the node will be created.\n"
+	       "\n");
+
+	if (type == 'b' || type =='c') {
+		/* read the 'dev' file for major/minor*/
+		attr = sysfs_get_classdev_attr(class_dev, "dev");
+		if (attr == NULL) {
+			printf("couldn't get the \"dev\" file\n");
+			retval = -1;
+			goto exit;
+		}
+		printf("device '%s' has major:minor %s", class_dev->path, attr->value);
 	}
-	printf("\ndevice '%s' has major:minor %s", class_dev->path, attr->value);
-	sysfs_close_attribute(attr);
 
 	/* open sysfs class device directory and print all attributes */
 	printf("  looking at class device '%s':\n", class_dev->path);
@@ -161,11 +178,11 @@ static int print_device_chain(const char *path)
 
 	/* get the device link (if parent exists look here) */
 	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	if (class_dev_parent != NULL) {
-		//sysfs_close_class_device(class_dev);
-		class_dev = class_dev_parent;
-	}
-	sysfs_dev = sysfs_get_classdev_device(class_dev);
+	if (class_dev_parent != NULL) 
+		sysfs_dev = sysfs_get_classdev_device(class_dev_parent);
+	else 
+		sysfs_dev = sysfs_get_classdev_device(class_dev);
+	
 	if (sysfs_dev != NULL)
 		printf("follow the class device's \"device\"\n");
 
@@ -182,13 +199,11 @@ static int print_device_chain(const char *path)
 		if (sysfs_dev_parent == NULL)
 			break;
 
-		//sysfs_close_device(sysfs_dev);
 		sysfs_dev = sysfs_dev_parent;
 	}
-	sysfs_close_device(sysfs_dev);
 
 exit:
-	//sysfs_close_class_device(class_dev);
+	sysfs_close_class_device(class_dev);
 	return retval;
 }
 
@@ -258,6 +273,11 @@ static int process_options(void)
 				break;
 			}
 
+			if (strcmp(optarg, "all") == 0) {
+				query = ALL;
+				break;
+			}
+
 			printf("unknown query type\n");
 			exit(1);
 
@@ -366,6 +386,10 @@ print:
 			strfieldcpy(result, path);
 			break;
 
+		case ALL:
+			print_record(path, &dev);
+			goto exit;
+
 		default:
 			goto exit;
 		}
@@ -406,8 +430,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"