summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/binlogcat.c20
-rw-r--r--src/binlogsel.c25
-rw-r--r--src/err.c9
-rw-r--r--src/err.h1
4 files changed, 51 insertions, 4 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)
{
@@ -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;
default:
exit(1);
}
diff --git a/src/err.c b/src/err.c
index 73aaba7..5c4d8d8 100644
--- a/src/err.c
+++ b/src/err.c
@@ -57,6 +57,15 @@ packerror(const char *fmt, ...)
va_start(ap, fmt);
verror(fmt, ap);
va_end(ap);
}
+void
+version(void)
+{
+ printf("%s (%s) %s\n", progname, PACKAGE_TARNAME, PACKAGE_VERSION);
+ printf("Copyright (C) 2013 Sergey Poznyakoff\n");
+ printf("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
+ printf("This is free software: you are free to change and redistribute it.\n");
+ printf("There is NO WARRANTY, to the extent permitted by law.\n");
+}
diff --git a/src/err.h b/src/err.h
index 69139fd..aab01be 100644
--- a/src/err.h
+++ b/src/err.h
@@ -16,6 +16,7 @@
*/
extern const char *progname;
void setprogname(const char *);
void error(const char *fmt, ...);
void packerror(const char *fmt, ...);
+void version(void);

Return to:

Send suggestions and report system problems to the System administrator.