Add version and help output to command line utilities.

4 files changed, 55 insertions, 8 deletions

diff --git a/src/binlogcat.c b/src/binlogcat.c
index 656d8f2..ada8efe 100644
--- a/src/binlogcat.c
+++ b/src/binlogcat.c
@@ -137,22 +137,35 @@ catlog(const char *fname)
         fclose(fp);
 }
 
 void
 help()
 {
-        printf("usage: %s [-dhnv] [-t FORMAT] [FILE...]\n", progname);
+        printf("usage: %s [-dhnVv] [-t FORMAT] [FILE...]\n", progname);
+        printf("Format binary log files in human-readable form\n");
+        printf("\nOptions are:\n\n");
+        printf("   -d         print timestamps relative to first record in the file\n");
+        printf("   -n         output record numbers\n");
+        printf("   -v         print information about each file\n");
+        printf("   -t FORMAT  format timestamps according to FORMAT\n");
+        printf("\n");
+        printf("   -h         print this help summary\n");
+        printf("   -V         show program version\n");
+        printf("\n");
+        printf("Report bugs and suggestions to <%s>\n", PACKAGE_BUGREPORT);
+        if (sizeof(PACKAGE_URL) > 1)
+                printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
 }
 
 int
 main(int argc, char **argv)
 {
         int c;
         
         setprogname(argv[0]);
-        while ((c = getopt(argc, argv, "dht:nv")) != EOF)
+        while ((c = getopt(argc, argv, "dht:nVv")) != EOF)
                 switch (c) {
                 case 'd':
                         timediff_option = 1;
                         timefmt = "%s";
                         break;
                 case 'h':
@@ -161,12 +174,15 @@ main(int argc, char **argv)
                 case 't':
                         timefmt = optarg;
                         break;
                 case 'n':
                         number_option = 1;
                         break;
+                case 'V':
+                        version();
+                        exit(0);
                 case 'v':
                         verbose_option = 1;
                         break;
                 default:
                         exit(1);
                 }
diff --git a/src/binlogsel.c b/src/binlogsel.c
index 8f1cfce..b05b12c 100644
--- a/src/binlogsel.c
+++ b/src/binlogsel.c
@@ -50,13 +50,31 @@ time_t from_time, to_time;
 static int matchnames(const char *dir, const char *pat, glob_t *gl);
 void selglob(const char *dir, const char *pattern);
 
 void
 help()
 {
-        printf("usage: %s [-dhnv] [-t FORMAT] [-F FROMTIME] [-T TOTIME] [-p PATTERN] [-D DIR] [FILE...]\n", progname);
+        printf("usage: %s [-dhnVv] [-t FORMAT] [-F TIME] [-T TIME] [-p PATTERN] [-D DIR] [FILE...]\n", progname);
+        printf("Select records from binary logs\n");
+        printf("\nOptions are:\n\n");
+        printf("   -D DIR     log file storage directory\n");
+        printf("   -F TIME    print records starting from TIME\n");
+        printf("   -T TIME    print records starting up to TIME\n");
+        printf("   -p PATTERN select files matching PATTERN\n");
+        printf("\n");
+        printf("   -d         print timestamps relative to first record in the file\n");
+        printf("   -n         output record numbers\n");
+        printf("   -v         print information about each file\n");
+        printf("   -t FMT     format timestamps according to FMT\n");
+        printf("\n");
+        printf("   -h         print this help summary\n");
+        printf("   -V         show program version\n");
+        printf("\n");
+        printf("Report bugs and suggestions to <%s>\n", PACKAGE_BUGREPORT);
+        if (sizeof(PACKAGE_URL) > 1)
+                printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
 }
 
 /* Convert strftime-like pattern into globbing pattern */
 char *
 convpattern(const char *dir)
 {
@@ -404,13 +422,13 @@ selidx_day(const char *dir)
                 }
                 to_day = filename_to_int(gl.gl_pathv[gl.gl_pathc - 1]);
         }
 
         dirlen = strlen(dir) + 4;
         dirbuf = xmalloc(dirlen);
-        for (;from_day <= to_day; from_day++) {
+        for (; from_day <= to_day; from_day++) {
                 snprintf(dirbuf, dirlen, "%s/%02d", dir, from_day);
                 selglob(dirbuf, BINLOG_GLOB_PATTERN);
         }
         free(dirbuf);
         if (glinit)
                 globfree(&gl);
@@ -455,13 +473,13 @@ selidx_month(const char *dir)
                 }
                 to_month = filename_to_int(gl.gl_pathv[gl.gl_pathc - 1]);
         }
 
         dirlen = strlen(dir) + 4;
         dirbuf = xmalloc(dirlen);
-        for (;from_month <= to_month; from_month++) {
+        for (; from_month <= to_month; from_month++) {
                 snprintf(dirbuf, dirlen, "%s/%02d", dir, from_month);
                 selidx_day(dirbuf);
         }
         free(dirbuf);
         if (glinit)
                 globfree(&gl);
@@ -501,23 +519,23 @@ selidx_year(const char *dir)
                 }
                 to_year = filename_to_int(gl.gl_pathv[gl.gl_pathc - 1]);
         }
 
         dirlen = strlen(dir) + 6;
         dirbuf = xmalloc(dirlen);
-        for (;from_year <= to_year; from_year++) {
+        for (; from_year <= to_year; from_year++) {
                 snprintf(dirbuf, dirlen, "%s/%04d", dir, from_year);
                 selidx_month(dirbuf);
         }
         free(dirbuf);
         if (glinit)
                 globfree(&gl);
 }
 
 int
-globerrfunc (const char *epath, int eerrno)
+globerrfunc(const char *epath, int eerrno)
 {
         error("%s: %s", epath, strerror(eerrno));
         return 0;
 }
 
 static int
@@ -611,13 +629,13 @@ int
 main(int argc, char **argv)
 {
         int c;
         struct timespec ts;
         
         setprogname(argv[0]);
-        while ((c = getopt(argc, argv, "D:dF:hi:p:T:t:nv")) != EOF)
+        while ((c = getopt(argc, argv, "D:dF:hi:p:T:t:nV")) != EOF)
                 switch (c) {
                 case 'D':
                         directory = optarg;
                         break;
                 case 'd':
                         timediff_option = 1;
@@ -655,12 +673,15 @@ main(int argc, char **argv)
                 case 't':
                         timefmt = optarg;
                         break;
                 case 'n':
                         number_option = 1;
                         break;
+                case 'V':
+                        version();
+                        exit(0);
                 case 'v':
                         verbose_option = 1;
                         break;