[PATCH v2] git-help: simplify and fix option parsing.

[PATCH v2] git-help: simplify and fix option parsing.

[Christian Couder]

Also use "execl_git_cmd" to launch "git-browse-help".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 help.c |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)

	Junio wrote:
	> This should be execl_git_cmd() to honor GIT_TRACE and to help
	> transition to bindir != gitexecdir layout, I think.

	Here it is.

diff --git a/help.c b/help.c
index ecc8c66..9d7fc8a 100644
--- a/help.c
+++ b/help.c
@@ -241,7 +241,9 @@ void list_common_cmds_help(void)
 
 static const char *cmd_to_page(const char *git_cmd)
 {
-	if (!prefixcmp(git_cmd, "git"))
+	if (!git_cmd)
+		return "git";
+	else if (!prefixcmp(git_cmd, "git"))
 		return git_cmd;
 	else {
 		int page_len = strlen(git_cmd) + 4;
@@ -268,7 +270,7 @@ static void show_info_page(const char *git_cmd)
 static void show_html_page(const char *git_cmd)
 {
 	const char *page = cmd_to_page(git_cmd);
-	execlp("git-browse-help", "git-browse-help", page, NULL);
+	execl_git_cmd("browse-help", page, NULL);
 }
 
 void help_unknown_cmd(const char *cmd)
@@ -283,38 +285,27 @@ int cmd_version(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
-static void check_help_cmd(const char *help_cmd)
+int cmd_help(int argc, const char **argv, const char *prefix)
 {
-	if (!help_cmd) {
+	if (argc < 2) {
 		printf("usage: %s\n\n", git_usage_string);
 		list_common_cmds_help();
 		exit(0);
 	}
 
-	else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) {
+	const char *help_cmd = argv[1];
+
+	if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) {
 		printf("usage: %s\n\n", git_usage_string);
 		list_commands();
-		exit(0);
 	}
-}
 
-int cmd_help(int argc, const char **argv, const char *prefix)
-{
-	const char *help_cmd = argc > 1 ? argv[1] : NULL;
-	check_help_cmd(help_cmd);
-
-	if (!strcmp(help_cmd, "--web") || !strcmp(help_cmd, "-w")) {
-		help_cmd = argc > 2 ? argv[2] : NULL;
-		check_help_cmd(help_cmd);
-
-		show_html_page(help_cmd);
+	else if (!strcmp(help_cmd, "--web") || !strcmp(help_cmd, "-w")) {
+		show_html_page(argc > 2 ? argv[2] : NULL);
 	}
 
 	else if (!strcmp(help_cmd, "--info") || !strcmp(help_cmd, "-i")) {
-		help_cmd = argc > 2 ? argv[2] : NULL;
-		check_help_cmd(help_cmd);
-
-		show_info_page(help_cmd);
+		show_info_page(argc > 2 ? argv[2] : NULL);
 	}
 
 	else
-- 
1.5.3.7.2200.g9275-dirty