summaryrefslogtreecommitdiffabout
path: root/src
authorSergey Poznyakoff <gray@gnu.org.ua>2013-10-15 17:07:26 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2013-10-15 17:07:26 (GMT)
commit7d0beb6599c53544739409ca4aec104bf27a3f35 (patch) (unidiff)
treeb561fbba7c9acedec17cbc398cee12a465faad6e /src
parentef3f928cc712f6774e19f8cb8f880cbeac15e8ff (diff)
downloadvmod-binlog-7d0beb6599c53544739409ca4aec104bf27a3f35.tar.gz
vmod-binlog-7d0beb6599c53544739409ca4aec104bf27a3f35.tar.bz2
Add version and help output to command line utilities.
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/binlogcat.c20
-rw-r--r--src/binlogsel.c33
-rw-r--r--src/err.c9
-rw-r--r--src/err.h1
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
@@ -140,7 +140,20 @@ catlog(const char *fname)
140void 140void
141help() 141help()
142{ 142{
143 printf("usage: %s [-dhnv] [-t FORMAT] [FILE...]\n", progname); 143 printf("usage: %s [-dhnVv] [-t FORMAT] [FILE...]\n", progname);
144 printf("Format binary log files in human-readable form\n");
145 printf("\nOptions are:\n\n");
146 printf(" -d print timestamps relative to first record in the file\n");
147 printf(" -n output record numbers\n");
148 printf(" -v print information about each file\n");
149 printf(" -t FORMAT format timestamps according to FORMAT\n");
150 printf("\n");
151 printf(" -h print this help summary\n");
152 printf(" -V show program version\n");
153 printf("\n");
154 printf("Report bugs and suggestions to <%s>\n", PACKAGE_BUGREPORT);
155 if (sizeof(PACKAGE_URL) > 1)
156 printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
144} 157}
145 158
146int 159int
@@ -149,7 +162,7 @@ main(int argc, char **argv)
149 int c; 162 int c;
150 163
151 setprogname(argv[0]); 164 setprogname(argv[0]);
152 while ((c = getopt(argc, argv, "dht:nv")) != EOF) 165 while ((c = getopt(argc, argv, "dht:nVv")) != EOF)
153 switch (c) { 166 switch (c) {
154 case 'd': 167 case 'd':
155 timediff_option = 1; 168 timediff_option = 1;
@@ -164,6 +177,9 @@ main(int argc, char **argv)
164 case 'n': 177 case 'n':
165 number_option = 1; 178 number_option = 1;
166 break; 179 break;
180 case 'V':
181 version();
182 exit(0);
167 case 'v': 183 case 'v':
168 verbose_option = 1; 184 verbose_option = 1;
169 break; 185 break;
diff --git a/src/binlogsel.c b/src/binlogsel.c
index 8f1cfce..b05b12c 100644
--- a/src/binlogsel.c
+++ b/src/binlogsel.c
@@ -53,7 +53,25 @@ void selglob(const char *dir, const char *pattern);
53void 53void
54help() 54help()
55{ 55{
56 printf("usage: %s [-dhnv] [-t FORMAT] [-F FROMTIME] [-T TOTIME] [-p PATTERN] [-D DIR] [FILE...]\n", progname); 56 printf("usage: %s [-dhnVv] [-t FORMAT] [-F TIME] [-T TIME] [-p PATTERN] [-D DIR] [FILE...]\n", progname);
57 printf("Select records from binary logs\n");
58 printf("\nOptions are:\n\n");
59 printf(" -D DIR log file storage directory\n");
60 printf(" -F TIME print records starting from TIME\n");
61 printf(" -T TIME print records starting up to TIME\n");
62 printf(" -p PATTERN select files matching PATTERN\n");
63 printf("\n");
64 printf(" -d print timestamps relative to first record in the file\n");
65 printf(" -n output record numbers\n");
66 printf(" -v print information about each file\n");
67 printf(" -t FMT format timestamps according to FMT\n");
68 printf("\n");
69 printf(" -h print this help summary\n");
70 printf(" -V show program version\n");
71 printf("\n");
72 printf("Report bugs and suggestions to <%s>\n", PACKAGE_BUGREPORT);
73 if (sizeof(PACKAGE_URL) > 1)
74 printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
57} 75}
58 76
59/* Convert strftime-like pattern into globbing pattern */ 77/* Convert strftime-like pattern into globbing pattern */
@@ -407,7 +425,7 @@ selidx_day(const char *dir)
407 425
408 dirlen = strlen(dir) + 4; 426 dirlen = strlen(dir) + 4;
409 dirbuf = xmalloc(dirlen); 427 dirbuf = xmalloc(dirlen);
410 for (;from_day <= to_day; from_day++) { 428 for (; from_day <= to_day; from_day++) {
411 snprintf(dirbuf, dirlen, "%s/%02d", dir, from_day); 429 snprintf(dirbuf, dirlen, "%s/%02d", dir, from_day);
412 selglob(dirbuf, BINLOG_GLOB_PATTERN); 430 selglob(dirbuf, BINLOG_GLOB_PATTERN);
413 } 431 }
@@ -458,7 +476,7 @@ selidx_month(const char *dir)
458 476
459 dirlen = strlen(dir) + 4; 477 dirlen = strlen(dir) + 4;
460 dirbuf = xmalloc(dirlen); 478 dirbuf = xmalloc(dirlen);
461 for (;from_month <= to_month; from_month++) { 479 for (; from_month <= to_month; from_month++) {
462 snprintf(dirbuf, dirlen, "%s/%02d", dir, from_month); 480 snprintf(dirbuf, dirlen, "%s/%02d", dir, from_month);
463 selidx_day(dirbuf); 481 selidx_day(dirbuf);
464 } 482 }
@@ -504,7 +522,7 @@ selidx_year(const char *dir)
504 522
505 dirlen = strlen(dir) + 6; 523 dirlen = strlen(dir) + 6;
506 dirbuf = xmalloc(dirlen); 524 dirbuf = xmalloc(dirlen);
507 for (;from_year <= to_year; from_year++) { 525 for (; from_year <= to_year; from_year++) {
508 snprintf(dirbuf, dirlen, "%s/%04d", dir, from_year); 526 snprintf(dirbuf, dirlen, "%s/%04d", dir, from_year);
509 selidx_month(dirbuf); 527 selidx_month(dirbuf);
510 } 528 }
@@ -514,7 +532,7 @@ selidx_year(const char *dir)
514} 532}
515 533
516int 534int
517globerrfunc (const char *epath, int eerrno) 535globerrfunc(const char *epath, int eerrno)
518{ 536{
519 error("%s: %s", epath, strerror(eerrno)); 537 error("%s: %s", epath, strerror(eerrno));
520 return 0; 538 return 0;
@@ -614,7 +632,7 @@ main(int argc, char **argv)
614 struct timespec ts; 632 struct timespec ts;
615 633
616 setprogname(argv[0]); 634 setprogname(argv[0]);
617 while ((c = getopt(argc, argv, "D:dF:hi:p:T:t:nv")) != EOF) 635 while ((c = getopt(argc, argv, "D:dF:hi:p:T:t:nV")) != EOF)
618 switch (c) { 636 switch (c) {
619 case 'D': 637 case 'D':
620 directory = optarg; 638 directory = optarg;
@@ -658,6 +676,9 @@ main(int argc, char **argv)
658 case 'n': 676 case 'n':
659 number_option = 1; 677 number_option = 1;
660 break; 678 break;
679 case 'V':
680 version();
681 exit(0);
661 case 'v': 682 case 'v':
662 verbose_option = 1; 683 verbose_option = 1;
663 break; 684 break;
diff --git a/src/err.c b/src/err.c
index 73aaba7..5c4d8d8 100644
--- a/src/err.c
+++ b/src/err.c
@@ -60,3 +60,12 @@ packerror(const char *fmt, ...)
60 va_end(ap); 60 va_end(ap);
61} 61}
62 62
63void
64version(void)
65{
66 printf("%s (%s) %s\n", progname, PACKAGE_TARNAME, PACKAGE_VERSION);
67 printf("Copyright (C) 2013 Sergey Poznyakoff\n");
68 printf("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
69 printf("This is free software: you are free to change and redistribute it.\n");
70 printf("There is NO WARRANTY, to the extent permitted by law.\n");
71}
diff --git a/src/err.h b/src/err.h
index 69139fd..aab01be 100644
--- a/src/err.h
+++ b/src/err.h
@@ -19,3 +19,4 @@ extern const char *progname;
19void setprogname(const char *); 19void setprogname(const char *);
20void error(const char *fmt, ...); 20void error(const char *fmt, ...);
21void packerror(const char *fmt, ...); 21void packerror(const char *fmt, ...);
22void version(void);

Return to:

Send suggestions and report system problems to the System administrator.