From: Minwoo Im <minwoo.im@samsung.com>
Date: Thu, 11 Apr 2019 12:51:19 +0000 (+0900)
Subject: plugin: Return EINVAL instead of ENOTTY
X-Git-Tag: v1.9~89^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=048cd68c8f32c42b7098e1d21c06966f7fc6f099;p=users%2Fsagi%2Fnvme-cli.git

plugin: Return EINVAL instead of ENOTTY

When a given string for a subcommand is not valid, we can return EINVAL which
means invalid arguments.  ENOTTY is used to indicate that an invalid IOCTL
number was specified.

Signed-off-by: Minwoo Im <minwoo.im@samsung.com>
---

diff --git a/nvme.c b/nvme.c
index 5606bc50..84ff4e8c 100644
--- a/nvme.c
+++ b/nvme.c
@@ -4962,7 +4962,7 @@ int main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 
 	ret = handle_plugin(argc - 1, &argv[1], nvme.extensions);
-	if (ret == -ENOTTY)
+	if (ret == -EINVAL)
 		general_help(&builtin);
 
 	return ret;
diff --git a/plugin.c b/plugin.c
index 4750df6b..aa49501e 100644
--- a/plugin.c
+++ b/plugin.c
@@ -161,7 +161,7 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
 	/* Check extensions only if this is running the built-in plugin */
 	if (plugin->name) { 
 		printf("ERROR: Invalid sub-command '%s' for plugin %s\n", str, plugin->name);
-		return -ENOTTY;
+		return -EINVAL;
         }
 
 	extension = plugin->next;
@@ -184,5 +184,5 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
 		extension = extension->next;
 	}
 	printf("ERROR: Invalid sub-command '%s'\n", str);
-	return -ENOTTY;
+	return -EINVAL;
 }