X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevinfo.c;h=5445b0fcc13e0ad1e6463a9b8439490e0afada35;hb=4febf7f076fa4abaa36b0ae047aa893b1334fc93;hp=a0a17c40b4d1828e31eaa6c4f8318fe577a0b906;hpb=e3396a2d383cf19092911a4643e092f6a825b2aa;p=elogind.git

diff --git a/udevinfo.c b/udevinfo.c
index a0a17c40b..5445b0fcc 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -1,7 +1,5 @@
 /*
- * udevinfo.c - fetches stored device information or sysfs attributes
- *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -14,7 +12,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -27,6 +25,9 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
+#include <getopt.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "udev.h"
 
@@ -57,10 +58,23 @@ static void print_all_attributes(const char *devpath, const char *key)
 	dir = opendir(path);
 	if (dir != NULL) {
 		for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+			struct stat statbuf;
+			char filename[PATH_SIZE];
 			char *attr_value;
 			char value[NAME_SIZE];
 			size_t len;
 
+			if (dent->d_name[0] == '.')
+				continue;
+
+			strlcpy(filename, path, sizeof(filename));
+			strlcat(filename, "/", sizeof(filename));
+			strlcat(filename, dent->d_name, sizeof(filename));
+			if (lstat(filename, &statbuf) != 0)
+				continue;
+			if (S_ISLNK(statbuf.st_mode))
+				continue;
+
 			attr_value = sysfs_attr_get_value(devpath, dent->d_name);
 			if (attr_value == NULL)
 				continue;
@@ -115,7 +129,7 @@ static int print_device_chain(const char *devpath)
 			break;
 		printf("  looking at parent device '%s':\n", dev->devpath);
 		printf("    KERNELS==\"%s\"\n", dev->kernel);
-		printf("    SUBSYTEMS==\"%s\"\n", dev->subsystem);
+		printf("    SUBSYSTEMS==\"%s\"\n", dev->subsystem);
 		printf("    DRIVERS==\"%s\"\n", dev->driver);
 
 		print_all_attributes(dev->devpath, "ATTRS");
@@ -169,6 +183,18 @@ int main(int argc, char *argv[], char *envp[])
 	struct udevice *udev;
 	int root = 0;
 
+	static const struct option options[] = {
+		{ "name", 1, NULL, 'n' },
+		{ "path", 1, NULL, 'p' },
+		{ "query", 1, NULL, 'q' },
+		{ "attribute-walk", 0, NULL, 'a' },
+		{ "export-db", 0, NULL, 'e' },
+		{ "root", 0, NULL, 'r' },
+		{ "version", 0, NULL, 'V' },
+		{ "help", 0, NULL, 'h' },
+		{}
+	};
+
 	enum action_type {
 		ACTION_NONE,
 		ACTION_QUERY,
@@ -201,9 +227,8 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	/* get command line options */
-	opterr = 0;
 	while (1) {
-		option = getopt(argc, argv, ":aden:p:q:rVh");
+		option = getopt_long(argc, argv, "aden:p:q:rVh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -269,30 +294,25 @@ int main(int argc, char *argv[], char *envp[])
 			printf("udevinfo, version %s\n", UDEV_VERSION);
 			goto exit;
 		case 'h':
-			printf("Usage: udevinfo [-anpqrVh]\n"
-			       "  -q 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"
+			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"
-			       "  -p PATH  sysfs device path used for query or chain\n"
-			       "  -n NAME  node/symlink name used for query\n"
+			       "  --path=<devpath>  sysfs device path used for query or chain\n"
+			       "  --name=<name>     node or symlink name used for query\n"
 			       "\n"
-			       "  -r       prepend to query result or print udev_root\n"
-			       "  -a       print all SYSFS_attributes along the device chain\n"
-			       "  -e       export the content of the udev database\n"
-			       "  -V       print udev version\n"
-			       "  -h       print this help text\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"
+			       "  --verision        print udev version\n"
+			       "  --help            print this text\n"
 			       "\n");
 			goto exit;
-		case ':':
-			fprintf(stderr, "missing argument for '%c'\n", optopt);
-			goto exit;
-		case '?':
 		default:
-			fprintf(stderr, "unrecognized option '%c'\n", optopt);
 			goto exit;
 		}
 	}
@@ -317,7 +337,7 @@ int main(int argc, char *argv[], char *envp[])
 			}
 			udev_db_get_device(udev, devpath);
 		} else {
-			fprintf(stderr, "query needs device path(-p) or node name(-n) specified\n");
+			fprintf(stderr, "query needs --path or node --name specified\n");
 			rc = 4;
 			goto exit;
 		}
@@ -368,7 +388,7 @@ int main(int argc, char *argv[], char *envp[])
 			}
 			print_device_chain(devpath);
 		} else {
-			fprintf(stderr, "attribute walk needs device path(-p) or node name(-n) specified\n");
+			fprintf(stderr, "attribute walk needs --path or node --name specified\n");
 			rc = 5;
 			goto exit;
 		}