linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Brian Norris <computersforpeace@gmail.com>
To: <linux-mtd@lists.infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Subject: [PATCH mtd-utils 02/11] flash_{un,}lock: switch to getopt library
Date: Mon, 31 Aug 2015 15:34:23 -0700	[thread overview]
Message-ID: <1441060472-82169-3-git-send-email-computersforpeace@gmail.com> (raw)
In-Reply-To: <1441060472-82169-1-git-send-email-computersforpeace@gmail.com>

We will be adding some more flags, so the getopt library can help.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 flash_unlock.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/flash_unlock.c b/flash_unlock.c
index ee8ac890f61c..777e4375a44d 100644
--- a/flash_unlock.c
+++ b/flash_unlock.c
@@ -13,6 +13,7 @@
 #define FLASH_UNLOCK 0
 #endif
 
+#include <getopt.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -35,6 +36,12 @@ static void usage(int status)
 	exit(status);
 }
 
+static const char short_opts[] = "h";
+static const struct option long_opts[] = {
+	{ "help",	no_argument,	0, 'h' },
+	{ NULL,		0,		0, 0 },
+};
+
 int main(int argc, char *argv[])
 {
 	int fd, request;
@@ -43,11 +50,26 @@ int main(int argc, char *argv[])
 	int count;
 	const char *dev;
 
+	for (;;) {
+		int c;
+
+		c = getopt_long(argc, argv, short_opts, long_opts, NULL);
+		if (c == EOF)
+			break;
+
+		switch (c) {
+		case 'h':
+			usage(0);
+			break;
+		default:
+			usage(1);
+			break;
+		}
+	}
+
 	/* Parse command line options */
 	if (argc < 2 || argc > 4)
 		usage(1);
-	if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
-		usage(0);
 
 	dev = argv[1];
 
-- 
2.5.0.457.gab17608

  parent reply	other threads:[~2015-08-31 22:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-31 22:34 [PATCH mtd-utils 00/11] flash_{un,}lock upgrades Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 01/11] flash_{un, }lock: nest optional parameters in help message Brian Norris
2015-08-31 22:34 ` Brian Norris [this message]
2015-08-31 22:34 ` [PATCH mtd-utils 03/11] flash_{un,}lock: support --version flag Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 04/11] flash_{un,}lock: document option flags Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 05/11] flash_{un, }lock: abstract the argument positions Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 06/11] flash_{un, }lock: move args processing to its own function Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 07/11] flash_{un, }lock: support both lock/unlock in the same binary Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 08/11] flash_{un,}lock: add MEMISLOCKED support Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 09/11] flash_{un, }lock: improve strtol() error handling Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 10/11] flash_{un,}lock: don't allow "last byte + 1" Brian Norris
2015-08-31 22:34 ` [PATCH mtd-utils 11/11] flash_{un,}lock: document block count == -1 Brian Norris
2015-11-11 22:13 ` [PATCH mtd-utils 00/11] flash_{un,}lock upgrades Brian Norris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441060472-82169-3-git-send-email-computersforpeace@gmail.com \
    --to=computersforpeace@gmail.com \
    --cc=linux-mtd@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).