git-help: add -i|--info option to display info page.
"git help --info subcommand" will now call "info git-subcommand". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Dec 2, 2007 at 06:07 UTC
df55c9cbc3ea79c51d5f41a628439283e94a87fd
1 file changed
+27
-8
help.c
+27
-8
@@ -239,24 +239,32 @@ void list_common_cmds_help(void)
239
}
240
}
241
242
-static void show_man_page(const char *git_cmd)
242
+static const char *cmd_to_page(const char *git_cmd)
243
{
244
- const char *page;
245
-
244
if (!prefixcmp(git_cmd, "git"))
247
- page = git_cmd;
245
+ return git_cmd;
246
else {
247
int page_len = strlen(git_cmd) + 4;
248
char *p = xmalloc(page_len + 1);
249
strcpy(p, "git-");
250
strcpy(p + 4, git_cmd);
251
p[page_len] = 0;
254
- page = p;
252
+ return p;
253
}
254
+}
255
256
+static void show_man_page(const char *git_cmd)
257
+{
258
+ const char *page = cmd_to_page(git_cmd);
259
execlp("man", "man", page, NULL);
260
}
261
262
+static void show_info_page(const char *git_cmd)
263
+{
264
+ const char *page = cmd_to_page(git_cmd);
265
+ execlp("info", "info", page, NULL);
266
+}
267
+
268
void help_unknown_cmd(const char *cmd)
269
{
270
fprintf(stderr, "git: '%s' is not a git-command. See 'git --help'.\n", cmd);
@@ -269,10 +277,8 @@ int cmd_version(int argc, const char **argv, const char *prefix)
277
return 0;
278
}
279
272
-int cmd_help(int argc, const char **argv, const char *prefix)
280
+static void check_help_cmd(const char *help_cmd)
281
{
274
- const char *help_cmd = argc > 1 ? argv[1] : NULL;
275
-
282
if (!help_cmd) {
283
printf("usage: %s\n\n", git_usage_string);
284
list_common_cmds_help();
@@ -284,6 +290,19 @@ int cmd_help(int argc, const char **argv, const char *prefix)
290
list_commands();
291
exit(0);
292
}
293
+}
294
+
295
+int cmd_help(int argc, const char **argv, const char *prefix)
296
+{
297
+ const char *help_cmd = argc > 1 ? argv[1] : NULL;
298
+ check_help_cmd(help_cmd);
299
+
300
+ if (!strcmp(help_cmd, "--info") || !strcmp(help_cmd, "-i")) {
301
+ help_cmd = argc > 2 ? argv[2] : NULL;
302
+ check_help_cmd(help_cmd);
303
+
304
+ show_info_page(help_cmd);
305
+ }
306
307
else
308
show_man_page(help_cmd);