From 7c994b7f6bda56308e5f1d50651d5951de92198f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 3 Oct 2018 08:05:58 +0200
Subject: New upstream version 3.2

---
 dmiopt.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'dmiopt.c')

diff --git a/dmiopt.c b/dmiopt.c
index da42546..2f285f3 100644
--- a/dmiopt.c
+++ b/dmiopt.c
@@ -113,7 +113,7 @@ static u8 *parse_opt_type(u8 *p, const char *arg)
 		char *next;
 
 		val = strtoul(arg, &next, 0);
-		if (next == arg)
+		if (next == arg || (*next != '\0' && *next != ',' && *next != ' '))
 		{
 			fprintf(stderr, "Invalid type keyword: %s\n", arg);
 			print_opt_type_list();
@@ -156,6 +156,7 @@ static const struct string_keyword opt_string_keyword[] = {
 	{ "system-version", 1, 0x06 },
 	{ "system-serial-number", 1, 0x07 },
 	{ "system-uuid", 1, 0x08 },             /* dmi_system_uuid() */
+	{ "system-family", 1, 0x1a },
 	{ "baseboard-manufacturer", 2, 0x04 },
 	{ "baseboard-product-name", 2, 0x05 },
 	{ "baseboard-version", 2, 0x06 },
@@ -227,7 +228,7 @@ static int parse_opt_oem_string(const char *arg)
 		goto done;
 
 	val = strtoul(arg, &next, 10);
-	if (next == arg || val == 0x00 || val > 0xff)
+	if (next == arg  || *next != '\0' || val == 0x00 || val > 0xff)
 	{
 		fprintf(stderr, "Invalid OEM string number: %s\n", arg);
 		return -1;
@@ -239,6 +240,19 @@ done:
 	return 0;
 }
 
+static u32 parse_opt_handle(const char *arg)
+{
+	u32 val;
+	char *next;
+
+	val = strtoul(arg, &next, 0);
+	if (next == arg || *next != '\0' || val > 0xffff)
+	{
+		fprintf(stderr, "Invalid handle number: %s\n", arg);
+		return ~0;
+	}
+	return val;
+}
 
 /*
  * Command line options handling
@@ -248,7 +262,7 @@ done:
 int parse_command_line(int argc, char * const argv[])
 {
 	int option;
-	const char *optstring = "d:hqs:t:uV";
+	const char *optstring = "d:hqs:t:uH:V";
 	struct option longopts[] = {
 		{ "dev-mem", required_argument, NULL, 'd' },
 		{ "help", no_argument, NULL, 'h' },
@@ -258,6 +272,7 @@ int parse_command_line(int argc, char * const argv[])
 		{ "dump", no_argument, NULL, 'u' },
 		{ "dump-bin", required_argument, NULL, 'B' },
 		{ "from-dump", required_argument, NULL, 'F' },
+		{ "handle", required_argument, NULL, 'H' },
 		{ "oem-string", required_argument, NULL, 'O' },
 		{ "no-sysfs", no_argument, NULL, 'S' },
 		{ "version", no_argument, NULL, 'V' },
@@ -299,6 +314,11 @@ int parse_command_line(int argc, char * const argv[])
 				if (opt.type == NULL)
 					return -1;
 				break;
+			case 'H':
+				opt.handle = parse_opt_handle(optarg);
+				if (opt.handle  == ~0U)
+					return -1;
+				break;
 			case 'u':
 				opt.flags |= FLAG_DUMP;
 				break;
@@ -325,9 +345,9 @@ int parse_command_line(int argc, char * const argv[])
 
 	/* Check for mutually exclusive output format options */
 	if ((opt.string != NULL) + (opt.type != NULL)
-	  + !!(opt.flags & FLAG_DUMP_BIN) > 1)
+	  + !!(opt.flags & FLAG_DUMP_BIN) + (opt.handle != ~0U) > 1)
 	{
-		fprintf(stderr, "Options --string, --type and --dump-bin are mutually exclusive\n");
+		fprintf(stderr, "Options --string, --type, --handle and --dump-bin are mutually exclusive\n");
 		return -1;
 	}
 
@@ -350,6 +370,7 @@ void print_help(void)
 		" -q, --quiet            Less verbose output\n"
 		" -s, --string KEYWORD   Only display the value of the given DMI string\n"
 		" -t, --type TYPE        Only display the entries of given type\n"
+		" -H, --handle HANDLE    Only display the entry of given handle\n"
 		" -u, --dump             Do not decode the entries\n"
 		"     --dump-bin FILE    Dump the DMI data to a binary file\n"
 		"     --from-dump FILE   Read the DMI data from a binary file\n"
-- 
cgit v1.2.3