1 files changed, 223 insertions, 12 deletions

diff --git a/src/binlogsel.c b/src/binlogsel.c
index 62299e5..8f1cfce 100644
--- a/src/binlogsel.c
+++ b/src/binlogsel.c
@@ -35,27 +35,32 @@
 #include "parse-datetime.h"
 
 char *timefmt = "%c";
 int number_option;
 int verbose_option;
 int timediff_option;
+char *directory;
 char *pattern;
+enum binlog_index_type index_type = index_year;
 
 #define FROM_TIME 0x01
 #define TO_TIME 0x02
 int timemask;
 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);
 }
 
 /* Convert strftime-like pattern into globbing pattern */
-void
+char *
 convpattern(const char *dir)
 {
         char *p, *q;
         char *newpat;
         size_t size = strlen(pattern) + 1;
 
@@ -70,19 +75,20 @@ convpattern(const char *dir)
                 p += strlen(dir);
                 *p++ = '/';
         }
         
         for (q = pattern; *q; ) {
                 if (*q == '%') {
+                        if (p > newpat && p[-1] != '*')
                                 *p++ = '*';
                         q += 2;
                 } else
                         *p++ = *q++;
         }
         *p = 0;
-        pattern = newpat;
+        return newpat;
 }
 
 #define getrec(base, recsize, n) \
         ((struct binlog_record*)((char *)(base) + (n) * (recsize)))
 
 int
@@ -330,19 +336,217 @@ void
 selfilelist(char **argv)
 {
         for (;*argv;++argv)
                 selfile(*argv);
 }
 
+static char *
+mkfilename(const char *dir, const char *file)
+{
+        size_t dirlen, size;
+        char *ret;
+                
+        dirlen = strlen(dir);
+        while (dirlen > 0 && dir[dirlen-1] == '/')
+                --dirlen;
+        size = dirlen + 1 + strlen(file) + 1;
+        ret = xmalloc(size);
+        memcpy(ret, dir, dirlen);
+        ret[dirlen++] = '/';
+        strcpy(ret + dirlen, file);
+        return ret;
+}
+
+int
+filename_to_int(char *name)
+{
+        char *p = strrchr(name, '/');
+        if (!p)
+                abort();
+        return atoi(p + 1);
+}
+
+void
+selidx_day(const char *dir)
+{       
+        int from_day, to_day;
+        struct tm *tm;
+        glob_t gl;
+        int glinit = 0;
+        char *dirbuf;
+        size_t dirlen;
+        
+        if (index_type == index_month) {
+                selglob(dir, BINLOG_GLOB_PATTERN);
+                return;
+        }
+
+        if (timemask & FROM_TIME)
+                from_day = gmtime(&from_time)->tm_mday;
+        else {
+                glinit = matchnames(dir, "[0-9][0-9]", &gl);
+                if (glinit)
+                        from_day = filename_to_int(gl.gl_pathv[0]);
+                else {
+                        error("no matching files");
+                        exit(1);
+                }
+        }
+
+        if (timemask & TO_TIME)
+                to_day = gmtime(&to_time)->tm_mday;
+        else {
+                if (!glinit) {
+                        glinit = matchnames(dir, "[0-9][0-9]", &gl);
+                        if (!glinit) {
+                                error("no matching files");
+                                exit(1);
+                        }
+                }
+                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++) {
+                snprintf(dirbuf, dirlen, "%s/%02d", dir, from_day);
+                selglob(dirbuf, BINLOG_GLOB_PATTERN);
+        }
+        free(dirbuf);
+        if (glinit)
+                globfree(&gl);
+}
+
+void
+selidx_month(const char *dir)
+{       
+        int from_month, to_month;
+        struct tm *tm;
+        glob_t gl;
+        int glinit = 0;
+        char *dirbuf;
+        size_t dirlen;
+
+        if (index_type == index_year) {
+                selglob(dir, BINLOG_GLOB_PATTERN);
+                return;
+        }
+        
+        if (timemask & FROM_TIME)
+                from_month = 1 + gmtime(&from_time)->tm_mon;
+        else {
+                glinit = matchnames(dir, "[0-9][0-9]", &gl);
+                if (glinit)
+                        from_month = filename_to_int(gl.gl_pathv[0]);
+                else {
+                        error("no matching files");
+                        exit(1);
+                }
+        }
+
+        if (timemask & TO_TIME)
+                to_month = 1 + gmtime(&to_time)->tm_mon;
+        else {
+                if (!glinit) {
+                        glinit = matchnames(dir, "[0-9][0-9]", &gl);
+                        if (!glinit) {
+                                error("no matching files");
+                                exit(1);
+                        }
+                }
+                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++) {
+                snprintf(dirbuf, dirlen, "%s/%02d", dir, from_month);
+                selidx_day(dirbuf);
+        }
+        free(dirbuf);
+        if (glinit)
+                globfree(&gl);
+}
+
+void
+selidx_year(const char *dir)
+{
+        int from_year, to_year;
+        struct tm *tm;
+        glob_t gl;
+        int glinit = 0;
+        char *dirbuf;
+        size_t dirlen;
+        
+        if (timemask & FROM_TIME)
+                from_year = 1900 + gmtime(&from_time)->tm_year;
+        else {
+                glinit = matchnames(dir, "[0-9][0-9][0-9][0-9]", &gl);
+                if (glinit)
+                        from_year = filename_to_int(gl.gl_pathv[0]);
+                else {
+                        error("no matching files");
+                        exit(1);
+                }
+        }
+
+        if (timemask & TO_TIME)
+                to_year = 1900 + gmtime(&to_time)->tm_year;
+        else {
+                if (!glinit) {
+                        glinit = matchnames(dir, "[0-9][0-9][0-9][0-9]", &gl);
+                        if (!glinit) {