21 files changed, 268 insertions, 82 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8139849..3b524ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,71 +1,72 @@
 # This file is part of Wydawca
 # Copyright (C) 2007, 2009, 2010 Sergey Poznyakoff
 #
 # Wydawca 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.
 #
 # Wydawca 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 Wydawca.  If not, see <http://www.gnu.org/licenses/>.
 
 sbin_PROGRAMS=wydawca
 wydawca_SOURCES=\
+ backup.c\
  builtin.c\
  builtin.h\
  cmdline.h\
  config.c\
  dictionary.c\
  directive.c\
  diskio.c\
  exec.c\
  gpg.c\
  interval.c\
  job.c\
  lock.c\
  meta.c\
  net.c\
  pidfile.c\
  process.c\
  pushd.c\
  sql.c\
  sql.h\
  tcpwrap.c\
  triplet.c\
  userprivs.c\
  verify.c\
  wydawca.c\
  wydawca.h\
  mail.h\
  mail.c\
  vtab.c\
  null.c\
  timer.c\
  txtacc.c\
  report.c
 
 BUILT_SOURCES=cmdline.h
 EXTRA_DIST=cmdline.opt pp-setup update-2.0.awk
 
 SUFFIXES=.opt .c .h
 
 .opt.h:
         $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@
 
 incdir=$(pkgdatadir)/$(VERSION)/include
 inc_DATA = $(PP_SETUP_FILE)
 
-LDADD=../grecs/src/libgrecs.a ../gnu/libgnu.a @SQLLIB@ @GPGMELIB@ @MAILUTILS_LIBS@
-INCLUDES = -I$(top_srcdir)/grecs/src/ -I$(top_srcdir)/gnu -I../gnu @MAILUTILS_INCLUDES@
+LDADD=../grecs/src/libgrecs.a @SQLLIB@ @GPGMELIB@ @MAILUTILS_LIBS@
+INCLUDES = -I$(top_srcdir)/grecs/src/ @MAILUTILS_INCLUDES@
 AM_CPPFLAGS= \
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DLOCALSTATEDIR=\"$(localstatedir)\"\
  -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\
  -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\
  -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)"
 
diff --git a/src/backup.c b/src/backup.c
new file mode 100644
index 0000000..312375d
--- /dev/null
+++ b/src/backup.c
@@ -0,0 +1,165 @@
+/* wydawca - automatic release submission daemon
+   Copyright (C) 2011 Sergey Poznyakoff
+
+   Wydawca 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 of the License, or (at your
+   option) any later version.
+
+   Wydawca 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 wydawca. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "wydawca.h"
+
+char const *simple_backup_suffix = "~";
+
+static const char *
+split_filename (char const *file, char **pdir)
+{
+  const char *p = strrchr (file, '/');
+
+  if (!p)
+    {
+      *pdir = grecs_strdup (".");
+      p = file;
+    }
+  else
+    {
+      size_t len = p - file; 
+      char *dir = grecs_malloc (len + 1);
+      memcpy (dir, file, len);
+      dir[len] = 0;
+      *pdir = dir;
+      p++;
+    }
+  return p;
+}
+
+#define MINSUFSIZE 8
+#define ISDIGIT(c) ('0' <= (c) && (c) <= '9')
+
+static char *
+get_backup_suffix (char const *file, enum backup_type type)
+{
+  char *dirname;
+  const char *basename;
+  size_t baselen;
+  DIR *dir;
+  struct dirent *ent;
+  char *lastsuf = NULL;
+  size_t lastsuflen = 0;
+  size_t lastsufsize = 0;
+  int carry;
+  char *newsuf;
+  char *q;
+      
+  if (type == simple_backups)
+    return grecs_strdup (simple_backup_suffix);
+
+  basename = split_filename (file, &dirname);
+  baselen = strlen (basename);
+  dir = opendir (dirname);
+  if (!dir)
+    {
+      int ec = errno;
+      free (dirname);
+      errno = ec;
+      return NULL;
+    }
+  
+  while ((ent = readdir (dir)))
+    {
+      size_t len = strlen (ent->d_name);
+      const char *p;
+      size_t suflen;
+      
+      if (len < baselen + 4 || memcmp (ent->d_name, basename, baselen))
+        continue;
+      p = ent->d_name + baselen;
+      suflen = len - baselen;
+      if (p[0] == '.' && p[1] == '~' && p[suflen-1] == '~' &&
+          (suflen > lastsuflen
+           || (suflen == lastsuflen &&
+               memcmp (p, lastsuf, lastsuflen) > 0)))
+        {
+          carry = 1;
+          for (q = (char*) p + suflen - 2; q > p + 1 && ISDIGIT (*q); q--)
+            if (*q != '9')
+              carry = 0;
+          q++;
+          if (!ISDIGIT (*q))
+            continue;
+          
+          if (suflen > lastsufsize)
+            {
+              lastsufsize = suflen;
+              if (!lastsuf)
+                {
+                  if (lastsufsize < MINSUFSIZE)
+                    lastsufsize = MINSUFSIZE;
+                  lastsuf = grecs_malloc (lastsufsize);
+                }
+              else
+                lastsuf = grecs_realloc (lastsuf, lastsufsize);