New utility binlogsel

* configure.ac: Check for yacc.
* src/.gitignore: Update.
* src/Makefile.am (libbinlog_a_SOURCES): Add new files.
Build binlogsel.
* src/binlogcat.c: Use xmalloc.
* src/binlogsel.c: New file.
* src/parse-datetime.h: New file.
* src/parse-datetime.y: New file.
* src/xalloc.c: New file.
* src/xalloc.h: New file.

8 files changed, 2144 insertions, 15 deletions

diff --git a/src/.gitignore b/src/.gitignore
index a75fe6d..8f5a6ab 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,5 @@
 binlogcat
+binlogsel
+parse-datetime.c
 vcc_if.c
 vcc_if.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e31e89..565444a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,32 +14,35 @@
 # You should have received a copy of the GNU General Public License
 # along with vmod-binlog.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(VARNISHSRC)/include -I$(VARNISHSRC)
 
 noinst_LIBRARIES = libbinlog.a
-libbinlog_a_SOURCES = pack.c err.c
+libbinlog_a_SOURCES = pack.c err.c parse-datetime.y xalloc.c
 libbinlog_a_CFLAGS = $(AM_CFLAGS)
 
-bin_PROGRAMS = binlogcat
+bin_PROGRAMS = binlogcat binlogsel
 binlogcat_SOURCES = binlogcat.c
 binlogcat_LDADD = ./libbinlog.a
 
+binlogsel_SOURCES = binlogsel.c
+binlogsel_LDADD = ./libbinlog.a
+
 vmoddir = $(VMODDIR)
 vmod_LTLIBRARIES = libvmod_binlog.la
 
 libvmod_binlog_la_LDFLAGS = -module -export-dynamic -avoid-version
 libvmod_binlog_la_LIBADD=
 
 libvmod_binlog_la_SOURCES = \
         binlog.c\
         pack.c\
         vmod-binlog.h\
         vcc_if.c vcc_if.h
 
-noinst_HEADERS = pack.h err.h
+noinst_HEADERS = pack.h err.h parse-datetime.h xalloc.h
 
 BUILT_SOURCES = vcc_if.c vcc_if.h
 
 vcc_if.c vcc_if.h: $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod.vcc
         @PYTHON@ $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod.vcc
 
diff --git a/src/binlogcat.c b/src/binlogcat.c
index 505bbc2..656d8f2 100644
--- a/src/binlogcat.c
+++ b/src/binlogcat.c
@@ -24,12 +24,13 @@
 #include <errno.h>
 #include <time.h>
 #include <string.h>
 #include "vmod-binlog.h"
 #include "pack.h"
 #include "err.h"
+#include "xalloc.h"
 
 char *timefmt = "%c";
 int number_option;
 int verbose_option;
 int timediff_option;
 
@@ -72,17 +73,13 @@ catlog(const char *fname)
         if (header.version != BINLOG_VERSION) {
                 error("%s: unknown version", fname);
                 exit(1);
         }
 
         size = header.hdrsize - sizeof(header);
-        dataspec = malloc(size);
-        if (!dataspec) {
-                error("not enough memory");
-                abort();
-        }
+        dataspec = xmalloc(size);
         
         if (fread(dataspec, size, 1, fp) != 1) {
                 error("error reading header of %s: %s",
                       fname, strerror(errno));
                 exit(1);
         }
@@ -91,26 +88,22 @@ catlog(const char *fname)
                 printf("# %s; format=%s; recsize=%lu; recnum=%lu\n",
                        fname, dataspec, header.recsize, header.recnum);
 
         inst = packcomp(dataspec, &p);
         if (!inst) {
                 if (errno == EINVAL) {
-                        error("%s: bad dataspec near %s", dataspec, p);
+                        error("%s: %s: bad dataspec near %s", fname, dataspec, p);
                         exit(1);
                 }
                 
                 error("%s", strerror(errno));
                 exit(1);
         }
         free(dataspec);
         
-        rec = malloc(header.recsize);
-        if (!rec) {
-                error("not enough memory");
-                exit(1);
-        }
+        rec = xmalloc(header.recsize);
         env = packenv_create(header.recsize -
                              offsetof(struct binlog_record,data));
         env->fp = stdout;
         
         for (i = 0; i < header.recnum; i++) {
                 if (fread(rec, header.recsize, 1, fp) != 1) {
@@ -144,13 +137,13 @@ catlog(const char *fname)
         fclose(fp);
 }
 
 void
 help()
 {
-        printf("usage: %s [-dhnv] [t FORMAT] [FILE...]\n", progname);
+        printf("usage: %s [-dhnv] [-t FORMAT] [FILE...]\n", progname);
 }
 
 int
 main(int argc, char **argv)
 {
         int c;
diff --git a/src/binlogsel.c b/src/binlogsel.c
new file mode 100644
index 0000000..62299e5
--- /dev/null
+++ b/src/binlogsel.c
@@ -0,0 +1,474 @@
+/* This file is part of vmod-binlog
+   Copyright (C) 2013 Sergey Poznyakoff
+
+   Vmod-binlog is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   Vmod-binlog is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with vmod-binlog.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <time.h>
+#include <string.h>
+#include <glob.h>
+#include "vmod-binlog.h"
+#include "pack.h"
+#include "err.h"
+#include "xalloc.h"
+#include "parse-datetime.h"
+
+char *timefmt = "%c";
+int number_option;
+int verbose_option;
+int timediff_option;
+char *pattern;
+
+#define FROM_TIME 0x01
+#define TO_TIME 0x02
+int timemask;
+time_t from_time, to_time;
+
+void
+help()
+{
+        printf("usage: %s [-dhnv] [-t FORMAT] [-F FROMTIME] [-T TOTIME] [-p PATTERN] [-D DIR] [FILE...]\n", progname);
+}
+
+/* Convert strftime-like pattern into globbing pattern */
+void