X-Git-Url: http://git.tuebingen.mpg.de/?p=tfortune.git;a=blobdiff_plain;f=tfortune.c;h=751334dd2b91d2f49f077a3aa0b1383db3a32bae;hp=0768976bfb83e8519aa29eab9ce40dfbb16a6413;hb=6f18187fadd61f42a8e207342b27f17d9b1b9f77;hpb=7acb033860d1e186999e799617be76d32aeb45e8

diff --git a/tfortune.c b/tfortune.c
index 0768976..751334d 100644
--- a/tfortune.c
+++ b/tfortune.c
@@ -930,11 +930,11 @@ static void show_subcommand_summary(bool verbose)
 		for (i = 0; i < LSG_NUM_TFORTUNE_SUBCOMMANDS; i++) {
 			if (i > 0)
 				n += printf(", ");
-			n += printf("%s", subcommand_names[i]);
 			if (n > 70) {
 				printf("\n\t");
 				n = 8;
 			}
+			n += printf("%s", subcommand_names[i]);
 		}
 		printf("\n");
 	}
@@ -969,6 +969,7 @@ static int com_help(void)
 }
 EXPORT_CMD_HANDLER(help);
 
+const char *GET_VERSION(void);
 static void handle_help_and_version(void)
 {
 	int i;
@@ -976,14 +977,19 @@ static void handle_help_and_version(void)
 	const struct lls_command *cmd;
 
 	if (OPT_GIVEN(TFORTUNE, VERSION)) {
-		printf("tfortune %s\n"
+		printf(PACKAGE " %s\n"
 			"Copyright (C) " COPYRIGHT_YEAR " " AUTHOR ".\n"
-			"License " LICENSE ": <" LICENSE_URL ">.\n"
+			"License: " LICENSE ": <" LICENSE_URL ">.\n"
 			"This is free software: you are free to change and redistribute it.\n"
 			"There is NO WARRANTY, to the extent permitted by law.\n"
-			"Report bugs to " AUTHOR " <" PACKAGE_BUGREPORT ">.\n"
+			"\n"
+			"Web page: " PACKAGE_HOMEPAGE "\n"
+			"Clone URL: " CLONE_URL "\n"
+			"Gitweb: " GITWEB_URL "\n"
+			"Author's Home Page: " HOME_URL "\n"
+			"Send feedback to: " AUTHOR " <" EMAIL ">\n"
 			,
-			tf_version()
+			GET_VERSION()
 		);
 		exit(EXIT_SUCCESS);
 	}
@@ -1448,7 +1454,7 @@ static int com_compgen(void)
 			}
 			break;
 		case WT_LONG_OPT_WITH_ARG:
-			if (strcmp(prev, "--basename") == 0) {
+			if (strcmp(prev, "--basedir") == 0) {
 				activate_dirname_completion();
 				return 1;
 			}