X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevinfo.c;h=52d409df88c520a5e6ef844027835269569ff353;hp=a2bc0136913070d569a62cf87a77d07181ab8977;hb=573bdd7e7588b70105c2976859696037899e9d4d;hpb=e9b647708440d4bff4c250292b72b0c59087e3df

diff --git a/udevinfo.c b/udevinfo.c
index a2bc01369..52d409df8 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -31,21 +31,6 @@
 
 #include "udev.h"
 
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
-	va_list	args;
-
-	if (priority > udev_log_priority)
-		return;
-
-	va_start(args, format);
-	vsyslog(priority, format, args);
-	va_end(args);
-}
-#endif
-
 static void print_all_attributes(const char *devpath, const char *key)
 {
 	char path[PATH_SIZE];
@@ -98,7 +83,6 @@ static void print_all_attributes(const char *devpath, const char *key)
 				continue;
 			}
 
-			replace_chars(value, ALLOWED_CHARS_INPUT);
 			printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
 		}
 	}
@@ -221,7 +205,18 @@ out:
 	return rc;
 }
 
-int main(int argc, char *argv[], char *envp[])
+static int stat_device(const char *name)
+{
+	struct stat statbuf;
+
+	if (stat(name, &statbuf) != 0)
+		return -1;
+
+	printf("%d %d\n", major(statbuf.st_dev), minor(statbuf.st_dev));
+	return 0;
+}
+
+int udevinfo(int argc, char *argv[], char *envp[])
 {
 	int option;
 	struct udevice *udev;
@@ -234,6 +229,7 @@ int main(int argc, char *argv[], char *envp[])
 		{ "attribute-walk", 0, NULL, 'a' },
 		{ "export-db", 0, NULL, 'e' },
 		{ "root", 0, NULL, 'r' },
+		{ "device-id-of-file", 1, NULL, 'd' },
 		{ "version", 0, NULL, 1 }, /* -V outputs braindead format */
 		{ "help", 0, NULL, 'h' },
 		{}
@@ -244,6 +240,7 @@ int main(int argc, char *argv[], char *envp[])
 		ACTION_QUERY,
 		ACTION_ATTRIBUTE_WALK,
 		ACTION_ROOT,
+		ACTION_DEVICE_ID_FILE,
 	} action = ACTION_NONE;
 
 	enum query_type {
@@ -271,7 +268,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	while (1) {
-		option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
+		option = getopt_long(argc, argv, "aed:n:p:q:rVh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -283,6 +280,7 @@ int main(int argc, char *argv[], char *envp[])
 				strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
 			else
 				strlcpy(name, optarg, sizeof(name));
+			remove_trailing_chars(name, '/');
 			dbg("name: %s", name);
 			break;
 		case 'p':
@@ -291,6 +289,27 @@ int main(int argc, char *argv[], char *envp[])
 				strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
 			else
 				strlcpy(path, optarg, sizeof(path));
+			remove_trailing_chars(path, '/');
+
+			/* possibly resolve to real devpath */
+			if (sysfs_resolve_link(path, sizeof(path)) != 0) {
+				char temp[PATH_SIZE];
+				char *pos;
+
+				/* also check if the parent is a link */
+				strlcpy(temp, path, sizeof(temp));
+				pos = strrchr(temp, '/');
+				if (pos != 0) {
+					char tail[PATH_SIZE];
+
+					strlcpy(tail, pos, sizeof(tail));
+					pos[0] = '\0';
+					if (sysfs_resolve_link(temp, sizeof(temp)) == 0) {
+						strlcpy(path, temp, sizeof(path));
+						strlcat(path, tail, sizeof(path));
+					}
+				}
+			}
 			dbg("path: %s", path);
 			break;
 		case 'q':
@@ -323,6 +342,10 @@ int main(int argc, char *argv[], char *envp[])
 				action = ACTION_ROOT;
 			root = 1;
 			break;
+		case 'd':
+			action = ACTION_DEVICE_ID_FILE;
+			strlcpy(name, optarg, sizeof(name));
+			break;
 		case 'a':
 			action = ACTION_ATTRIBUTE_WALK;
 			break;
@@ -336,21 +359,21 @@ int main(int argc, char *argv[], char *envp[])
 			printf("udevinfo, version %s\n", UDEV_VERSION);
 			goto exit;
 		case 'h':
-			printf("Usage: udevinfo OPTIONS\n"
-			       "  --query=<type>    query database for the specified value:\n"
-			       "    name            name of device node\n"
-			       "    symlink         pointing to node\n"
-			       "    path            sysfs device path\n"
-			       "    env             the device related imported environment\n"
-			       "    all             all values\n"
-			       "\n"
-			       "  --path=<devpath>  sysfs device path used for query or chain\n"
-			       "  --name=<name>     node or symlink name used for query\n"
-			       "\n"
-			       "  --root            prepend to query result or print udev_root\n"
-			       "  --attribute-walk  print all SYSFS_attributes along the device chain\n"
-			       "  --export-db       export the content of the udev database\n"
-			       "  --help            print this text\n"
+			printf("Usage: udevadm info OPTIONS\n"
+			       "  --query=<type>             query database for the specified value:\n"
+			       "      name                     name of device node\n"
+			       "      symlink                  pointing to node\n"
+			       "      path                     sysfs device path\n"
+			       "      env                      the device related imported environment\n"
+			       "      all                      all values\n"
+			       "  --path=<devpath>           sysfs device path used for query or chain\n"
+			       "  --name=<name>              node or symlink name used for query\n"
+			       "  --root                     prepend to query result or print udev_root\n"
+			       "  --attribute-walk           print all key matches while walking along chain\n"
+			       "                             of parent devices\n"
+			       "  --device-id-of-file=<file> print major/minor of underlying device\n"
+			       "  --export-db                export the content of the udev database\n"
+			       "  --help                     print this text\n"
 			       "\n");
 			goto exit;
 		default:
@@ -436,6 +459,10 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 		break;
+	case ACTION_DEVICE_ID_FILE:
+		if (stat_device(name) != 0)
+			rc = 6;
+		break;
 	case ACTION_ROOT:
 		printf("%s\n", udev_root);
 		break;