X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=tfortune.c;h=ec4c323f7c29040b0bbb7d1e883f303c6559951c;hb=278b70e25a37bae191066c4e08f96fd8624f31e4;hp=7e59eb69e39c2872d715ce5f0aff71fb65c06011;hpb=b4aae30257e0822ee2229cd761d8c50a8d54748e;p=tfortune.git

diff --git a/tfortune.c b/tfortune.c
index 7e59eb6..ec4c323 100644
--- a/tfortune.c
+++ b/tfortune.c
@@ -335,7 +335,7 @@ static struct epi_iter *epi_iter_new(void)
 			regfile_iter_next(riter)
 		) {
 			eiter->num_maps++;
-			eiter->maps = realloc(eiter->maps,
+			eiter->maps = xrealloc(eiter->maps,
 				eiter->num_maps * sizeof(*eiter->maps));
 			eiter->maps[eiter->num_maps - 1] = iov;
 		}
@@ -895,11 +895,11 @@ static int com_stats(void)
 	printf("number of tags..................... %5lu\n", num_tags);
 	printf("number of unique tags.............. %5u\n", num_unique_tags);
 	printf("average number of epigrams per file %8.02f\n",
-		(float)num_epis / num_epi_files);
-	printf("average number of tags per epigram. %8.02f\n",
-		(float)num_tags / num_epis);
-	printf("average number of tag recurrence... %8.02f\n",
-		(float)num_tags / num_unique_tags);
+		num_epi_files > 0?  (float)num_epis / num_epi_files : 0);
+	printf("average number of tags per epigram. %8.02f\n", num_epis > 0?
+		(float)num_tags / num_epis : 0);
+	printf("average number of tag recurrence... %8.02f\n", num_unique_tags > 0?
+		(float)num_tags / num_unique_tags : 0);
 	if (verbose) {
 		printf("\nlinear hashing statistics:\n%s\n", lh_stats);
 		free(lh_stats);
@@ -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;
 			}