X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=800882eb1aa4b2d077bc7315d41a448e77c99e2b;hp=a2f5601b7c9b8518af3c88be5361f54bbe27a8ef;hb=ddc8f83132368098e63634dd355cde7d787fc85c;hpb=869fc2f1ff73209b9aa5dc7d582eba39feaf6f86

diff --git a/udevinfo.c b/udevinfo.c
index a2f5601b7..800882eb1 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -27,18 +27,31 @@
 #include <unistd.h>
 #include <errno.h>
 
+#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"
-#include "libsysfs/libsysfs.h"
 
 
 # define SYSFS_VALUE_MAX 200
 
 char **main_argv;
 int main_argc;
-char **main_envp;
+
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message (int level, const char *format, ...)
+{
+	va_list	args;
+
+	va_start(args, format);
+	vsyslog(level, format, args);
+	va_end(args);
+}
+#endif
 
 static int print_all_attributes(const char *path)
 {
@@ -61,7 +74,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;
@@ -79,7 +92,7 @@ static int print_all_attributes(const char *path)
 				len--;
 			}
 			if (len == 0)
-				printf("    SYSFS_%s=\"%s\"\n", attr->name, value);
+				printf("    SYSFS{%s}=\"%s\"\n", attr->name, value);
 		}
 	}
 	printf("\n");
@@ -99,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;
 }
@@ -110,7 +126,8 @@ enum query_type {
 	SYMLINK,
 	MODE,
 	OWNER,
-	GROUP
+	GROUP,
+	ALL
 };
 
 static int print_device_chain(const char *path)
@@ -136,8 +153,14 @@ static int print_device_chain(const char *path)
 		retval = -1;
 		goto exit;
 	}
-	printf("\ndevice '%s' has major:minor %s", class_dev->path, attr->value);
-	sysfs_close_attribute(attr);
+
+	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");
+	printf("device '%s' has major:minor %s", class_dev->path, attr->value);
 
 	/* open sysfs class device directory and print all attributes */
 	printf("  looking at class device '%s':\n", class_dev->path);
@@ -149,11 +172,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");
 
@@ -170,13 +193,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;
 }
 
@@ -246,6 +267,11 @@ static int process_options(void)
 				break;
 			}
 
+			if (strcmp(optarg, "all") == 0) {
+				query = ALL;
+				break;
+			}
+
 			printf("unknown query type\n");
 			exit(1);
 
@@ -294,8 +320,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;
@@ -331,7 +357,7 @@ print:
 		case NAME:
 			if (root)
 				strfieldcpy(result, udev_root);
-			strncat(result, dev.name, sizeof(result));
+			strfieldcat(result, dev.name);
 			break;
 
 		case SYMLINK:
@@ -354,6 +380,10 @@ print:
 			strfieldcpy(result, path);
 			break;
 
+		case ALL:
+			print_record(path, &dev);
+			goto exit;
+
 		default:
 			goto exit;
 		}
@@ -373,7 +403,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;
@@ -394,11 +424,13 @@ 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 attributes along the chain of the device\n"
+	       "  -a       print all SYSFS_attributes along the device chain\n"
 	       "  -d       dump whole database\n"
 	       "  -V       print udev version\n"
 	       "  -h       print this help text\n"
@@ -412,7 +444,8 @@ int main(int argc, char *argv[], char *envp[])
 
 	main_argv = argv;
 	main_argc = argc;
-	main_envp = envp;
+
+	init_logging("udevinfo");
 
 	/* initialize our configuration */
 	udev_init_config();