Drop gnulib.

* bootstrap: Rewrite.
* bootstrap.conf: Remove.
* configure.ac: Remove gl_EARLY/gl_INIT
* src/backup.c: New file.
* src/txtacc.c (txtacc_finish): Make sure a new entry is
appended only once to the list.
* (all sources): Use grecs memory allocation functions.
* src/wydawca.h" Include fnmatch.h and regex.h
(backup_type): New enum.
(simple_backup_suffix): New extern.
(find_backup_file_name): New proto.
* tests/bkupname.c: New file.
* tests/backup00.at: New file.
* tests/backup01.at: New file.
* tests/backup02.at: New file.
* tests/backup03.at: New file.
* tests/Makefile.am: Add new tests.
* tests/testsuite.at: Add new tests.

* grecs: Update.

34 files changed, 485 insertions, 779 deletions

diff --git a/Makefile.am b/Makefile.am
index a182931..29641e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with wydawca.  If not, see <http://www.gnu.org/licenses/>.
 
-ACLOCAL_AMFLAGS = -I m4 -I grecs/am
+ACLOCAL_AMFLAGS = -I grecs/am
 
-SUBDIRS=gnu grecs src doc etc tests
+SUBDIRS=grecs src doc etc tests
 
 # We never remove files from the configuration directory 
 distuninstallcheck_listfiles = \
diff --git a/bootstrap b/bootstrap
index 760a095..ae677ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,615 +1,5 @@
 #! /bin/sh
-
-# Bootstrap this package from checked-out sources.
-
-# Copyright (C) 2003-2008, 2009 Free Software Foundation, Inc.
-
-# Dico 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.
-
-# Dico 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 Dico.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Paul Eggert.
-
-nl='
-'
-
-# Ensure file names are sorted consistently across platforms.
-LC_ALL=C
-export LC_ALL
-
-local_gl_dir=gl
-
-# Temporary directory names.
-bt='._bootmp'
-bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
-bt2=${bt}2
-
-usage() {
-  echo >&2 "\
-Usage: $0 [OPTION]...
-Bootstrap this package from the checked-out sources.
-
-Options:
- --gnulib-srcdir=DIRNAME  Specify the local directory where gnulib
-                          sources reside.  Use this if you already
-                          have gnulib sources on your machine, and
-                          do not want to waste your bandwidth downloading
-                          them again.
- --copy                   Copy files instead of creating symbolic links.
- --force                  Attempt to bootstrap even if the sources seem
-                          not to have been checked out.
- --skip-po                Do not download po files.
-
-If the file bootstrap.conf exists in the current working directory, its
-contents are read as shell variables to configure the bootstrap.
-
-Running without arguments will suffice in most cases.
-"
-}
-
-# Configuration.
-
-# Name of the Makefile.am
-gnulib_mk=gnulib.mk
-
-# List of gnulib modules needed.
-gnulib_modules=
-
-# Any gnulib files needed that are not in modules.
-gnulib_files=
-
-# The command to download all .po files for a specified domain into
-# a specified directory.  Fill in the first %s is the domain name, and
-# the second with the destination directory.  Use rsync's -L and -r
-# options because the latest/%s directory and the .po files within are
-# all symlinks.
-po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
-
-extract_package_name='
-  /^AC_INIT(/{
-     /.*,.*,.*, */{
-       s///
-       s/[][]//g
-       s/)$//
-       p
-       q
-     }
-     s/AC_INIT(\[*//
-     s/]*,.*//
-     s/^GNU //
-     y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^A-Za-z0-9_]/-/g
-     p
-  }
-'
-package=`sed -n "$extract_package_name" configure.ac` || exit
-gnulib_name=lib$package
-
-build_aux=build-aux
-source_base=lib
-m4_base=m4
-doc_base=doc
-tests_base=tests
-
-# Extra files from gnulib, which override files from other sources.
-gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/missing
-        $build_aux/mdate-sh
-        $build_aux/texinfo.tex
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
-        doc/INSTALL
-"
-
-# Additional gnulib-tool options to use.  Use "\newline" to break lines.
-gnulib_tool_option_extras=
-
-# Other locale categories that need message catalogs.
-EXTRA_LOCALE_CATEGORIES=
-
-# Additional xgettext options to use.  Use "\\\newline" to break lines.
-XGETTEXT_OPTIONS='\\\
- --flag=_:1:pass-c-format\\\
- --flag=N_:1:pass-c-format\\\
- --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
-'
-
-# Package bug report address for gettext files
-MSGID_BUGS_ADDRESS=bug-$package@gnu.org
-
-# Files we don't want to import.
-excluded_files=
-
-# File that should exist in the top directory of a checked out hierarchy,
-# but not in a distribution tarball.
-checkout_only_file=README-hacking
-
-# Whether to use copies instead of symlinks.
-copy=false
-
-# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
-# those files to be generated in directories like lib/, m4/, and po/.
-# Or set it to 'auto' to make this script select which to use based
-# on which version control system (if any) is used in the source directory.
-vc_ignore=auto
-
-# Override the default configuration, if necessary.
-test -r bootstrap.conf && . ./bootstrap.conf
-
-if test "$vc_ignore" = auto; then
-  vc_ignore=
-  test -d .git && vc_ignore=.gitignore
-  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
-fi
-
-# Translate configuration into internal form.
-
-# Parse options.
-
-for option
-do
-  case $option in
-  --help)
-    usage
-    exit;;
-  --gnulib-srcdir=*)
-    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
-  --skip-po)
-    SKIP_PO=t;;
-  --force)
-    checkout_only_file=;;
-  --copy)
-    copy=true;;
-  *)
-    echo >&2 "$0: $option: unknown option"
-    exit 1;;
-  esac
-done
-
-if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
-  exit 1
-fi
-
-# If $STR is not already on a line by itself in $FILE, insert it,
-# sorting the new contents of the file and replacing $FILE with the result.
-insert_sorted_if_absent() {
-  file=$1
-  str=$2
-  test -f $file || touch $file
-  echo "$str" | sort -u - $file | cmp -s - $file \
-    || echo "$str" | sort -u - $file -o $file \
-    || exit 1
-}
-
-# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
-found_aux_dir=no
-        grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
-    >/dev/null && found_aux_dir=yes
-        grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
-    >/dev/null && found_aux_dir=yes
-if test $found_aux_dir = no; then
-  echo "$0: expected line not found in configure.ac. Add the following:" >&2
-  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2
-  exit 1
-fi
-
-# If $build_aux doesn't exist, create it now, otherwise some bits
-# below will malfunction.  If creating it, also mark it as ignored.
-if test ! -d $build_aux; then
-  mkdir $build_aux
-  for dot_ig in x $vc_ignore; do
-    test $dot_ig = x && continue
-    insert_sorted_if_absent $dot_ig $build_aux
-  done
-fi
-
-echo "$0: Bootstrapping from checked-out $package sources..."
-
-cleanup_gnulib() {
-  status=$?
-  rm -fr gnulib
-  exit $status
-}
-
-# Get gnulib files.
-
-case ${GNULIB_SRCDIR--} in
--)
-  if [ ! -d gnulib ]; then
-    echo "$0: getting gnulib files..."
-
-    trap cleanup_gnulib 1 2 13 15
-
-    git clone --depth 2 git://git.sv.gnu.org/gnulib ||
-      cleanup_gnulib
-
-    trap - 1 2 13 15
-  fi
-  GNULIB_SRCDIR=gnulib
-esac
-
-gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
-
-# Get translations.
-
-download_po_files() {
-  subdir=$1
-  domain=$2
-  echo "$0: getting translations into $subdir for $domain..."
-  cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
-  eval "$cmd"
-}
-
-# Download .po files to $po_dir/.reference and copy only the new
-# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
-update_po_files() {
-  # Directory containing primary .po files.
-  # Overwrite them only when we're sure a .po file is new.
-  po_dir=$1
-  domain=$2
-
-  # Download *.po files into this dir.
-  # Usually contains *.s1 checksum files.
-  ref_po_dir="$po_dir/.reference"
-
-  test -d $ref_po_dir || mkdir $ref_po_dir || return
-  download_po_files $ref_po_dir $domain \
-    && ls "$ref_po_dir"/*.po 2>/dev/null |
-      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
-
-  langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
-  test "$langs" = '*' && langs=x
-  for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do
-    case $po in x) continue;; esac
-    new_po="$ref_po_dir/$po.po"
-    cksum_file="$ref_po_dir/$po.s1"
-    if ! test -f "$cksum_file" ||
-        ! test -f "$po_dir/$po.po" ||
-        ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
-      echo "updated $po_dir/$po.po..."
-      cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
-    fi
-  done
-}
-
-case $SKIP_PO in
-'')
-  if test -d po; then
-    update_po_files po $package || exit
-  fi
-
-  if test -d runtime-po; then
-    update_po_files runtime-po $package-runtime || exit
-  fi;;
-esac
-
-symlink_to_dir()
-{
-  src=$1/$2
-  dst=${3-$2}
-
-  test -f "$src" && {
-
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=`dirname "$dst"`
-    if ! test -d "$dst_dir"; then
-      mkdir -p "$dst_dir"
-
-      # If we've just created a directory like lib/uniwidth,
-      # tell version control system(s) it's ignorable.
-      # FIXME: for now, this does only one level
-      parent=`dirname "$dst_dir"`
-      for dot_ig in x $vc_ignore; do
-        test $dot_ig = x && continue
-        ig=$parent/$dot_ig
-        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
-      done
-    fi
-
-    if $copy; then
-      {
-        test ! -h "$dst" || {
-          echo "$0: rm -f $dst" &&
-          rm -f "$dst"
-        }
-      } &&
-      test -f "$dst" &&
-      cmp -s "$src" "$dst" || {
-        echo "$0: cp -fp $src $dst" &&
-        cp -fp "$src" "$dst"
-      }
-    else
-      test -h "$dst" &&
-      src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
-      dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
-      test "$src_i" = "$dst_i" || {
-        dot_dots=
-        case $src in
-        /*) ;;
-        *)
-          case /$dst/ in
-          *//* | */../* | */./* | /*/*/*/*/*/)
-             echo >&2 "$0: invalid symlink calculation: $src -> $dst"
-             exit 1;;
-                  /*/*/*/*/)dot_dots=../../../;;
-                  /*/*/*/)dot_dots=../../;;
-                  /*/*/)dot_dots=../;;
-          esac;;
-        esac
-
-        echo "$0: ln -fs $dot_dots$src $dst" &&
-        ln -fs "$dot_dots$src" "$dst"
-      }
-    fi
-  }
-}
-
-cp_mark_as_generated()
-{
-  cp_src=$1
-  cp_dst=$2
-
-  if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
-    symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
-  elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
-    symlink_to_dir $local_gl_dir "$cp_dst"
-  else
-    case $cp_dst in
-      *.[ch])             c1='/* '; c2=' */';;
-      *.texi)             c1='@c '; c2=     ;;
-      *.m4|*/Make*|Make*) c1='# ' ; c2=     ;;
-      *)                  c1=     ; c2=     ;;
-    esac
-
-    # If the destination directory doesn't exist, create it.
-    # This is required at least for "lib/uniwidth/cjk.h".
-    dst_dir=`dirname "$cp_dst"`
-    test -d "$dst_dir" || mkdir -p "$dst_dir"
-
-    if test -z "$c1"; then
-      cmp -s "$cp_src" "$cp_dst" || {
-        echo "$0: cp -f $cp_src $cp_dst" &&
-        rm -f "$cp_dst" &&
-        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
-      }
-    else
-      # Copy the file first to get proper permissions if it
-      # doesn't already exist.  Then overwrite the copy.
-      cp "$cp_src" "$cp_dst-t" &&
-      (
-        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
-        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
-        sed "s!$bt_regex/!!g" "$cp_src"
-      ) > $cp_dst-t &&
-      if cmp -s "$cp_dst-t" "$cp_dst"; then
-        rm -f "$cp_dst-t"
-      else
-        echo "$0: cp $cp_src $cp_dst # with edits" &&
-        mv -f "$cp_dst-t" "$cp_dst"
-      fi
-    fi
-  fi
-}
-
-version_controlled_file() {
-  dir=$1
-  file=$2
-  found=no
-  if test -d CVS; then
-    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
-             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
-  elif test -d .git; then
-    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
-  elif test -d .svn; then
-    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
-  else
-    echo "$0: no version control for $dir/$file?" >&2
-  fi
-  test $found = yes
-}
-
-slurp() {
-  for dir in . `(cd $1 && find * -type d -print)`; do
-    copied=
-    sep=
-    for file in `ls -a $1/$dir`; do
-      case $file in
-      .|..) continue;;
-      .*) continue;; # FIXME: should all file names starting with "." be ignored?
-      esac
-      test -d $1/$dir/$file && continue
-      for excluded_file in $excluded_files; do
-        test "$dir/$file" = "$excluded_file" && continue 2
-      done
-      if test $file = Makefile.am; then
-        copied=$copied${sep}$gnulib_mk; sep=$nl
-        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
-          echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
-          rm -f $dir/$gnulib_mk &&
-          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
-        }
-      elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
-           version_controlled_file $dir $file; then
-        echo "$0: $dir/$file overrides $1/$dir/$file"
-      else
-        copied=$copied$sep$file; sep=$nl
-        if test $file = gettext.m4; then
-          echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
-          rm -f $dir/$file
-          sed '
-            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-              AC_DEFUN([AM_INTL_SUBDIR], [
-            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-            $a\
-              AC_DEFUN([gl_LOCK_EARLY], [])
-          ' $1/$dir/$file >$dir/$file
-        else
-          cp_mark_as_generated $1/$dir/$file $dir/$file
-        fi
-      fi || exit
-    done
-
-    for dot_ig in x $vc_ignore; do
-      test $dot_ig = x && continue
-      ig=$dir/$dot_ig
-      if test -n "$copied"; then
-        insert_sorted_if_absent $ig "$copied"
-        # If an ignored file name ends with .in.h, then also add
-        # the name with just ".h".  Many gnulib headers are generated,
-        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
-        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-        f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
-        insert_sorted_if_absent $ig "$f"
-
-        # For files like sys_stat.in.h and sys_time.in.h, record as
-        # ignorable the directory we might eventually create: sys/.
-        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-        insert_sorted_if_absent $ig "$f"
-      fi
-    done
-  done
-}
-
-
-# Create boot temporary directories to import from gnulib and gettext.
-rm -fr $bt $bt2 &&
-mkdir $bt $bt2 || exit
-
-# Import from gnulib.
-
-gnulib_tool_options="\
- --import\
- --no-changelog\
- --aux-dir $bt/$build_aux\
- --doc-base $bt/$doc_base\
- --lib $gnulib_name\
- --m4-base $bt/$m4_base/\
- --source-base $bt/$source_base/\
- --tests-base $bt/$tests_base\
- --local-dir $local_gl_dir\
- $gnulib_tool_option_extras\
-"
-echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
-slurp $bt || exit
-
-for file in $gnulib_files; do
-  symlink_to_dir "$GNULIB_SRCDIR" $file || exit
-done
-
-
-# Import from gettext.
-with_gettext=yes
-        grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
-    with_gettext=no
-
-if test $with_gettext = yes; then
-  echo "$0: (cd $bt2; autopoint) ..."
-  cp configure.ac $bt2 &&
-  (cd $bt2 && autopoint && rm configure.ac) &&
-  slurp $bt2 $bt || exit
-
-  rm -fr $bt $bt2 || exit
-fi
-
-# Coreutils is unusual in that it generates some of its test-related
-# Makefile.am files.  That must be done before invoking automake.
-mam_template=tests/Makefile.am.in
-if test -f $mam_template; then
-  PERL=perl
-  for tool in cut head join pr sort tac tail test tr uniq wc; do
-    m=tests/$tool/Makefile.am
-    t=${m}t
-    rm -f $m $t
-    sed -n '1,/^##test-files-begin/p' $mam_template > $t
-    echo "x = $tool" >> $t
-    srcdir=tests/$tool
-    $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t
-    sed -n '/^##test-files-end/,$p' $mam_template >> $t
-    chmod -w $t
-    mv $t $m
-  done
-fi
-
-# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
-# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
-# The following requires GNU find 4.2.3 or newer.  Considering the usual
-# portability constraints of this script, that may seem a very demanding
-# requirement, but it should be ok.  Ignore any failure, which is fine,
-# since this is only a convenience to help developers avoid the relatively
-# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
-# between successive runs of this script.
-find "$m4_base" "$source_base" \
-  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
-  -type l -xtype l -delete > /dev/null 2>&1
-
-# Reconfigure, getting other files.
-
-echo "$0: autoreconf --force --install --symlink ..."
-autoreconf --force --install --symlink
-
-# FIXME: A kludge to avoid unnecessary data in the distribution.
-test -d libltdl/config && rm -rf libltdl/config
-test -d libltdl/m4 && rm -rf libltdl/m4
-
-# Get some extra files from gnulib, overriding existing files.
-for file in $gnulib_extra_files; do
-  case $file in
-  */INSTALL) dst=INSTALL;;
-  build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
-  *) dst=$file;;
-  esac
-  symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
-done
-
-if test $with_gettext = yes; then
-  # Create gettext configuration.
-  echo "$0: Creating po/Makevars from po/Makevars.template ..."
-  rm -f po/Makevars
-  sed '
-    /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-    /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
-    /^XGETTEXT_OPTIONS *=/{
-      s/$/ \\/
-      a\
-          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
-    }
-  ' po/Makevars.template >po/Makevars
-
-  if test -d runtime-po; then
-    # Similarly for runtime-po/Makevars, but not quite the same.
-    rm -f runtime-po/Makevars
-    sed '
-      /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
-      /^subdir *=.*/s/=.*/= runtime-po/
-      /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
-      /^XGETTEXT_OPTIONS *=/{
-        s/$/ \\/
-        a\
-            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
-      }
-    ' <po/Makevars.template >runtime-po/Makevars
-
-    # Copy identical files from po to runtime-po.
-    (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
-  fi
-fi
-
-echo "$0: done.  Now you can run './configure'."
+set -e
+git submodule init
+git submodule update
+autoreconf -f -i -s
diff --git a/bootstrap.conf b/bootstrap.conf
deleted file mode 100644
index 8464d0d..0000000
--- a/bootstrap.conf
+++ b/dev/null
@@ -1,68 +0,0 @@
-# Bootstrap configuration.
-
-# 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/>.
-
-source_base=gnu
-gnulib_name=libgnu
-gnulib_mk=Makefile.am
-
-test -d $source_base || mkdir -p $source_base
-
-git submodule init || exit $?
-git submodule update || exit $?
-
-# We don't need these modules, even though gnulib-tool mistakenly
-# includes them because of gettext dependencies.
-avoided_gnulib_modules='
-        --avoid=lock
-        --avoid=size_max
-'
-
-# gnulib modules used by this package.
-gnulib_modules="`grep -h '^[^#]' gnulib.modules | sort | uniq`"
-
-# Additional xgettext options to use.  Use "\\\newline" to break lines.
-XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
- --flag=_:1:pass-c-format\\\
- --flag=N_:1:pass-c-format\\\
- --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
- --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
- --flag=gconf_warning:3:c-format\\\
- --flag=gconf_error:3:c-format\\\
-'
-
-# Gettext supplies these files, but we don't need them since
-# we don't have an intl subdirectory.
-excluded_files='
-    m4/glibc2.m4
-    m4/intdiv0.m4
-    m4/lcmessage.m4
-    m4/lock.m4
-    m4/uintmax_t.m4
-    m4/ulonglong.m4
-    m4/visibility.m4
-'
-
-# Read local configuration file
-if [ -r .bootstrap ]; then
-  echo "$0: Reading configuration file .bootstrap"
-  eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
-fi
-
-test -f Changelog || cat > ChangeLog <<EOT
-This file is a placeholder. It will be replaced with the actual ChangeLog
-by make dist.  Run make ChangeLog if you wish to create it earlier.
-EOT
diff --git a/configure.ac b/configure.ac
index 7002fb9..344c3b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,6 @@ AM_SILENT_RULES([yes])
 
 # Checks for programs.
 AC_PROG_CC
-        gl_EARLY
-AC_PROG_LEX
-AC_PROG_YACC
 AC_PROG_RANLIB
 
 # Checks for libraries.
@@ -47,7 +44,6 @@ AC_TYPE_SIZE_T
 AC_HEADER_STDBOOL
 
 # Checks for library functions.
-gl_INIT  
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
@@ -135,7 +131,6 @@ fi
 
 AC_CONFIG_FILES([Makefile
                  doc/Makefile
-                 gnu/Makefile
                  src/Makefile
                  etc/Makefile])
                  
diff --git a/gnulib.modules b/gnulib.modules
deleted file mode 100644
index dd5124a..0000000
--- a/gnulib.modules
+++ b/dev/null
@@ -1,4 +0,0 @@
-xalloc
-getline
-mkdtemp
-backupfile
diff --git a/grecs b/grecs
-Subproject f8ca129aaf4876dfa9778c34ed5bd8a669ca22e
+Subproject 4c1056b45580fcb687cac656834f42dd9fba4ae
diff --git a/src/Makefile.am b/src/Makefile.am
index 8139849..3b524ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@
 
 sbin_PROGRAMS=wydawca
 wydawca_SOURCES=\
+ backup.c\
  builtin.c\
  builtin.h\
  cmdline.h\
@@ -60,8 +61,8 @@ SUFFIXES=.opt .c .h
 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)\"\
diff --git a/src/backup.c b/src/backup.c
new file mode 100644
index 0000000..312375d
--- a/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);
+            }
+          memcpy (lastsuf, p, suflen);
+          lastsuflen = suflen;
+        }
+    }
+  closedir (dir);
+  free (dirname);
+
+  if (lastsuf)
+    {
+      size_t newsuflen;
+      
+      newsuflen = lastsuflen + carry;
+      newsuf = grecs_malloc (newsuflen + 1);
+      newsuf[0] = '.';
+      newsuf[1] = '~';
+      newsuf[2] = '0';
+      memcpy (newsuf + 2 + carry, lastsuf + 2, lastsuflen - 3);
+      newsuf[newsuflen-1] = '~';
+      newsuf[newsuflen] = 0;
+      
+      for (q = newsuf + newsuflen - 2; *q == '9'; q--)
+        *q = '0';
+      ++*q;
+      free (lastsuf);
+    }
+  else if (type == numbered_existing_backups)
+    newsuf = grecs_strdup (simple_backup_suffix);
+  else
+    newsuf = grecs_strdup (".~1~");
+  return newsuf;
+}
+
+char *
+find_backup_file_name (char const *file, enum backup_type type)
+{
+  size_t flen;
+  char *suffix;
+  char *newname;
+  
+  if (type == no_backups)
+    {
+      errno = 0;
+      return NULL;
+    }
+
+  suffix = get_backup_suffix (file, type);
+  if (!suffix)
+    return NULL;
+  flen = strlen (file);
+  newname = grecs_malloc (flen + strlen (suffix) + 1);
+  memcpy (newname, file, flen);
+  strcpy (newname + flen, suffix);
+  free (suffix);
+  /* FIXME: Check newname length */
+  return newname;
+}
diff --git a/src/builtin.c b/src/builtin.c
index 9d1063c..8a07eab 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -16,8 +16,10 @@
 
 #include "wydawca.h"
 #include "builtin.h"
-#include "fnmatch.h"
-#include "regex.h"
+
+#ifndef FNM_CASEFOLD
+# define FNM_CASEFOLD 0
+#endif
 
 int
 builtin_init (struct dictionary *dict)
@@ -220,9 +222,9 @@ builtin_lookup (struct dictionary *dict, void *handle, const char *req)
       size_t i;
       char *p;
 
-      bds = xmalloc (sizeof (*bds));
+      bds = grecs_malloc (sizeof (*bds));
       count *= ncol;
-      bds->wp = xcalloc (count, sizeof (bds->wp[0]));
+      bds->wp = grecs_calloc (count, sizeof (bds->wp[0]));
       bds->acc = acc;
       p = txtacc_finish (acc, 0);
 
diff --git a/src/config.c b/src/config.c
index df9816e..8250749 100644
--- a/src/config.c
+++ b/src/config.c
@@ -146,7 +146,7 @@ safe_file_name (char *file_name)
 char *
 safe_file_name_alloc (const char *file_name)
 {
-  char *s = xstrdup (file_name);
+  char *s = grecs_strdup (file_name);
   char *ns = safe_file_name (s);
   if (!ns)
     free (s);
@@ -549,8 +549,8 @@ cb_sql_host (enum grecs_callback_command cmd,
       *p++ = 0;
       if (p[0] == '/')
         {
-          pconn->socket = xstrdup (p);
-          pconn->host = xstrdup ("localhost");
+          pconn->socket = grecs_strdup (p);
+          pconn->host = grecs_strdup ("localhost");
         }
       else
         {
@@ -569,11 +569,11 @@ cb_sql_host (enum grecs_callback_command cmd,
             }
           pconn->port = n;
           /* Save host name */
-          pconn->host = xstrdup (value->v.string);
+          pconn->host = grecs_strdup (value->v.string);
         }
     }
   else
-    pconn->host = xstrdup (value->v.string);
+    pconn->host = grecs_strdup (value->v.string);
   return 0;
 }
 
@@ -594,7 +594,7 @@ cb_sql (enum grecs_callback_command cmd,
         grecs_error(locus, 0, _("tag must be a string"));
         return 0;
       }
-    pconn = xzalloc (sizeof (*pconn));
+    pconn = grecs_zalloc (sizeof (*pconn));
     pconn->ident = strdup (value->v.string);
     *pdata = pconn;
     break;
@@ -896,7 +896,7 @@ cb_notify_event (enum grecs_callback_command cmd,
 
   switch (cmd) {
   case grecs_callback_section_begin:
-    ntf = xzalloc (sizeof (*ntf));
+    ntf = grecs_zalloc (sizeof (*ntf));
     *pdata = ntf;
     break;
 
@@ -984,7 +984,7 @@ cb_dictionary_params (enum grecs_callback_command cmd,
       struct grecs_list_entry *ep;
 
       meth->parmc = size;
-      meth->parmv = xcalloc (size + 1, sizeof (meth->parmv[0]));
+      meth->parmv = grecs_calloc (size + 1, sizeof (meth->parmv[0]));
 
       for (i = 0, ep = value->v.list->head; ep; ep = ep->next, i++)
         {
@@ -993,7 +993,7 @@ cb_dictionary_params (enum grecs_callback_command cmd,
           if (assert_string_arg (locus, cmd, vp))
             break;
 
-          meth->parmv[i] = xstrdup (vp->v.string);
+          meth->parmv[i] = grecs_strdup (vp->v.string);
         }
       meth->parmv[i] = NULL;
     }
@@ -1159,8 +1159,8 @@ cb_spool (enum grecs_callback_command cmd,
           grecs_error (locus, 0, _("tag must be a string"));
           return 1;
         }
-      spool = xzalloc (sizeof (*spool));
-      spool->tag = xstrdup (value->v.string);
+      spool = grecs_zalloc (sizeof (*spool));
+      spool->tag = grecs_strdup (value->v.string);
       spool->file_sweep_time = file_sweep_time;
       for (i = 0; i < NITEMS (spool->dictionary); i++)
         spool->dictionary[i] = default_dictionary[i];
@@ -1277,8 +1277,8 @@ cb_supp_groups (enum grecs_callback_command cmd,
       int i;
       struct grecs_list_entry *ep;
 
-      wydawca_supp_groups = xcalloc (wydawca_supp_groupc,
-                                     sizeof (wydawca_supp_groups[0]));
+      wydawca_supp_groups = grecs_calloc (wydawca_supp_groupc,
+                                          sizeof (wydawca_supp_groups[0]));
 
       for (i = 0, ep = value->v.list->head; ep; ep = ep->next, i++)
         {
diff --git a/src/dictionary.c b/src/dictionary.c
index b7baf05..2b995d4 100644
--- a/src/dictionary.c
+++ b/src/dictionary.c
@@ -48,8 +48,7 @@ static struct dictionary_descr dictionary_tab[] = {
 struct dictionary *
 dictionary_new (enum dictionary_id id, enum dictionary_type type)
 {
-  struct dictionary *mp = xmalloc (sizeof mp[0]);
-  memset (mp, 0, sizeof mp[0]);
+  struct dictionary *mp = grecs_zalloc (sizeof mp[0]);
   mp->id = id;
   mp->type = type;
   return mp;
@@ -92,6 +91,8 @@ int
 dictionary_close (struct dictionary *dict, void *handle)
 {
   struct dictionary_descr *mp = dictionary_tab + dict->type;
+  if (mp->free)
+    mp->free (dict, handle);
   if (!mp->close)
     return 0;
   return mp->close (dict, handle);
@@ -186,7 +187,7 @@ dictionary_copy_result (struct dictionary *dict, const char *res, size_t size)
   if (dict->result_size < size + 1)
     {
       dict->result_size = size + 1;
-      dict->result = x2realloc (dict->result, &dict->result_size);
+      dict->result = grecs_realloc (dict->result, dict->result_size);
     }
   memcpy (dict->result, res, size);
   dict->result[size] = 0;
@@ -206,7 +207,7 @@ dictionary_quote_string (struct dictionary *dict, void *handle,
 
   if (!input)
     {
-      *poutput = xmalloc (1);
+      *poutput = grecs_malloc (1);
       (*poutput)[0] = 0;
       *psize = 1;
       return 0;
@@ -216,7 +217,7 @@ dictionary_quote_string (struct dictionary *dict, void *handle,
     return mp->quote (dict, handle, input, poutput, psize);
 
   size = wordsplit_c_quoted_length (input, 0, &quote);
-  output = xmalloc (size + 1);
+  output = grecs_malloc (size + 1);
   wordsplit_c_quote_copy (output, input, 0);
   output[size] = 0;
 
diff --git a/src/directive.c b/src/directive.c
index 08a14df..fadaedf 100644
--- a/src/directive.c
+++ b/src/directive.c
@@ -34,7 +34,7 @@ directive_parse (struct file_triplet *trp)
     if (*p == '\n')
       dcount++;
 
-  trp->directive = xcalloc (dcount + 1, sizeof trp->directive[0]);
+  trp->directive = grecs_calloc (dcount + 1, sizeof trp->directive[0]);
   p = trp->blurb;
   for (i = j = 0; i < dcount; i++)
     {
@@ -111,7 +111,7 @@ _directive_seq_get (int n, struct file_triplet *trp,
   if (len + 1 > trp->tmpsize)
     {
       trp->tmpsize = len + 1;
-      trp->tmp = x2realloc (trp->tmp, &trp->tmpsize);
+      trp->tmp = grecs_realloc (trp->tmp, trp->tmpsize);
     }
   memcpy (trp->tmp, trp->directive[n], len);
   trp->tmp[len] = 0;
@@ -380,7 +380,7 @@ stderr_redirector (const char *tag)
       fp = fdopen (p[0], "r");
       if (!fp)
         _exit (127);
-      while (getline (&buf, &size, fp) >= 0)
+      while (grecs_getline (&buf, &size, fp) >= 0)
         {
           trim_crlf (buf);
           logmsg (LOG_NOTICE, "%s: %s", tag, buf);
@@ -493,7 +493,7 @@ run_check_script (const char *script, struct file_triplet *trp,
   size = total = 0;
   if (debug_level > 2)
     logmsg (LOG_DEBUG, _("reading script output..."));
-  while (getline (&buf, &size, fp) > 0)
+  while (grecs_getline (&buf, &size, fp) > 0)
     {
       size_t len = strlen (buf);
       if (debug_level > 2)
diff --git a/src/diskio.c b/src/diskio.c
index 9addd9b..b175a45 100644
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -46,7 +46,7 @@ concat_dir (const char *base, const char *name, size_t *pbaselen)
     len--;
 
   size = len + 1 + strlen (name);
-  dir = xmalloc (size + 1);
+  dir = grecs_malloc (size + 1);
   memcpy (dir, base, len);
   dir[len++] = '/';
   strcpy (dir + len, name);
@@ -171,7 +171,7 @@ copy_file (const char *file, const char *dst_file)
        bufsize /= 2)
     ;
   if (bufsize == 0)
-    xalloc_die ();
+    grecs_alloc_die ();
 
   rc = 0;
   while (fsize > 0)
@@ -492,7 +492,7 @@ make_signame (const char *file_name)
   if (((len = strlen (file_name)) > SUF_SIG_LEN
        && memcmp (file_name + len - SUF_SIG_LEN, SUF_SIG, SUF_SIG_LEN)))
     {
-      char *signame = xmalloc (len + SUF_SIG_LEN + 1);
+      char *signame = grecs_malloc (len + SUF_SIG_LEN + 1);
       strcpy (signame, file_name);
       return strcat (signame, SUF_SIG);
     }
diff --git a/src/exec.c b/src/exec.c
index ed7ee1e..7ebf152 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -75,7 +75,7 @@ log_output (int prio, const char *prog, FILE *fp)
   char *buf = NULL;
 
   logmsg (prio, _("%s output follows:"), prog);
-  while (getline (&buf, &size, fp) > 0)
+  while (grecs_getline (&buf, &size, fp) > 0)
     logmsg (prio, "%s", buf);
   logmsg (prio, _("end of %s output"), prog);
   free (buf);
diff --git a/src/gpg.c b/src/gpg.c
index 474d94b..d4f9b71 100644
--- a/src/gpg.c
+++ b/src/gpg.c
@@ -132,7 +132,7 @@ create_gpg_homedir ()
   if (temp_homedir)
     return 0;
 
-  temp_homedir = xstrdup ("/tmp/wydawca-XXXXXX");
+  temp_homedir = grecs_strdup ("/tmp/wydawca-XXXXXX");
   if (!mkdtemp (temp_homedir))
     {
       logmsg (LOG_CRIT, _("cannot create GPG home directory (%s): %s"),
@@ -237,7 +237,7 @@ verify_directive_signature (struct file_triplet *trp)
       fail_if_err (gpgme_op_import (ctx, key_data));
       res = gpgme_op_import_result (ctx);
       pstat = res->imports;
-      uptr->fpr = xstrdup (pstat->fpr);
+      uptr->fpr = grecs_strdup (pstat->fpr);
       if (debug_level > 2)
         logmsg (LOG_DEBUG, _("imported key: user = %s, fingerprint = %s"),
                 uptr->name, uptr->fpr);
@@ -271,7 +271,8 @@ verify_directive_signature (struct file_triplet *trp)
 
   gpgme_data_release (directive_data);
   gpgme_data_release (key_data);
-
+  gpgme_release (ctx);
+  
   return rc;
 }
 
diff --git a/src/job.c b/src/job.c
index 7e3fdf5..764e463 100644
--- a/src/job.c
+++ b/src/job.c
@@ -205,7 +205,7 @@ schedule_job (const struct spool *spool, uid_t uid)
   job = job_locate (spool, uid);
   if (!job)
     {
-      job = xzalloc (sizeof (*job));
+      job = grecs_zalloc (sizeof (*job));
       job->spool = spool;
       job->uid = uid;
       job->pid = -1;
diff --git a/src/lock.c b/src/lock.c
index 32367de..dece75d 100644
--- a/src/lock.c
+++ b/src/lock.c
@@ -187,15 +187,15 @@ host_name ()
       if (!hostbuf)
         {
           size = 256;
-          hostbuf = xmalloc (size);
+          hostbuf = grecs_malloc (size);
         }
       else
         {
           size_t ns = size * 2;
           if (size < ns)
-            xalloc_die ();
+            grecs_alloc_die ();
           size = ns;
-          hostbuf = xrealloc (hostbuf, size);
+          hostbuf = grecs_realloc (hostbuf, size);
         }
     }
   while ((rc = gethostname (hostbuf, size )) == -1 &&
@@ -261,7 +261,7 @@ wydawca_unlock (const char *lockfile)
 static char *
 fix_tagname (const char *tag)
 {
-  char *tagname = xstrdup (tag);
+  char *tagname = grecs_strdup (tag);
   char *p;
   
   for (p = tagname; *p; p++)
@@ -278,7 +278,7 @@ wydawca_lockname (const char *tag)
   char *tagname = fix_tagname (tag);
   grecs_asprintf (&lockname, &size, "%s/LCK.%s", lockdir, tagname);
   if (!lockname)
-    xalloc_die ();
+    grecs_alloc_die ();
   free (tagname);
   return lockname;
 }
@@ -289,7 +289,7 @@ wydawca_lock_init ()
   if (enable_locking)
     {
       if (!lockdir)
-        lockdir = xstrdup (LOCALSTATEDIR "/lock/" PACKAGE);
+        lockdir = grecs_strdup (LOCALSTATEDIR "/lock/" PACKAGE);
       if (create_hierarchy (lockdir, 0))
         exit (EX_OSFILE);
     }
diff --git a/src/mail.c b/src/mail.c
index bac0381..6855ed7 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -291,7 +291,7 @@ mail_send_message (mu_address_t rcpt, const char *text,
   if (rcpt)
     {
       mu_address_to_string (rcpt, NULL, 0, &size);
-      buf = xmalloc (size + 1);
+      buf = grecs_malloc (size + 1);
       mu_address_to_string (rcpt, buf, size + 1, NULL);
 
       mu_header_set_value (hdr, "To", buf, 1);
@@ -300,7 +300,7 @@ mail_send_message (mu_address_t rcpt, const char *text,
       if (from_address && mu_header_sget_value (hdr, "From", &sval))
         {
           mu_address_to_string (from_address, NULL, 0, &size);
-          buf = xmalloc (size + 1);
+          buf = grecs_malloc (size + 1);
           mu_address_to_string (from_address, buf, size + 1, NULL);
           mu_header_set_value (hdr, "From", buf, 1);
           free (buf);
@@ -434,7 +434,7 @@ mail_stats ()
       size_t size;
       char *buf;
       mu_address_to_string (admin_address, NULL, 0, &size);
-      buf = xmalloc (size + 1);
+      buf = grecs_malloc (size + 1);
       mu_address_to_string (admin_address, buf, size + 1, NULL);
       logmsg (LOG_DEBUG, _("sending stats to %s"), buf);
       free (buf);
@@ -444,7 +444,7 @@ mail_stats ()
   exp = make_stat_expansion (tc + 1);
   time (&t);
   exp[0].kw = "date";
-  exp[0].value = exp[0].storage = xstrdup (ctime (&t));
+  exp[0].value = exp[0].storage = grecs_strdup (ctime (&t));
   exp[0].value [strlen (exp[0].value) - 1] = 0;
   timer_fill_meta (exp + 1, tc);
 
@@ -598,7 +598,7 @@ do_notify (struct file_triplet *trp, enum notification_event ev,
           size_t size;
           char *buf;
           mu_address_to_string (rcpt, NULL, 0, &size);
-          buf = xmalloc (size + 1);
+          buf = grecs_malloc (size + 1);
           mu_address_to_string (rcpt, buf, size + 1, NULL);
           logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"),
                   buf, trp->project, notification_event_str (ev));
@@ -642,7 +642,7 @@ expand_email_admin (struct metadef *def, void *data)
   if (mu_address_to_string (admin_address, NULL, 0, &size) == 0)
     {
       size++;
-      def->storage = xmalloc (size);
+      def->storage = grecs_malloc (size);
       mu_address_to_string (admin_address, def->storage, size, NULL);
       def->value = def->storage;
     }
@@ -670,7 +670,7 @@ expand_email_owner (struct metadef *def, void *data)
   else if (mu_address_to_string (addr, NULL, 0, &size) == 0)
     {
       size++;
-      def->storage = xmalloc (size);
+      def->storage = grecs_malloc (size);
       mu_address_to_string (addr, def->storage, size, NULL);
       def->value = def->storage;
       mu_address_destroy (&addr);
diff --git a/src/net.c b/src/net.c
index 3e9fe30..d08a6ba 100644
--- a/src/net.c
+++ b/src/net.c
@@ -103,7 +103,7 @@ handle_connection (FILE *in, FILE *out)
   char *p;
   struct passwd *pw;
 
-  if (getline (&buf, &buflen, in) <= 0)
+  if (grecs_getline (&buf, &buflen, in) <= 0)
     return;
   trim_crlf (buf);
   if (debug_level)
@@ -125,7 +125,7 @@ handle_connection (FILE *in, FILE *out)
   else
     fprintf (out, "+ OK, spool %s\r\n", spool->tag);
 
-  if (getline (&buf, &buflen, in) < 0)
+  if (grecs_getline (&buf, &buflen, in) < 0)
     {
       logmsg (LOG_ERR, "protocol error");
       free (buf);
diff --git a/src/process.c b/src/process.c
index e41709d..200d987 100644
--- a/src/process.c
+++ b/src/process.c
@@ -27,7 +27,7 @@ static struct spool_list *spool_list;
 void
 register_spool (struct spool *spool)
 {
-  struct spool_list *sp = xmalloc (sizeof *sp);
+  struct spool_list *sp = grecs_malloc (sizeof *sp);
   sp->spool = *spool;
   sp->next = spool_list;
   spool_list = sp;
@@ -113,7 +113,7 @@ parse_file_name (const char *name, struct file_info *finfo)
           && memcmp (name + len - suftab[i].len,
                      suftab[i].suf, suftab[i].len) == 0)
         {
-          finfo->name = xstrdup (name);
+          finfo->name = grecs_strdup (name);
           finfo->type = suftab[i].type;
           finfo->root_len = len - suftab[i].len;
           return;
diff --git a/src/sql.c b/src/sql.c
index a4b311e..80eb344 100644
--- a/src/sql.c
+++ b/src/sql.c
@@ -30,7 +30,7 @@ static struct sql_list *sql_list;
 void
 sql_register_conn (struct sqlconn *conn)
 {
-  struct sql_list *ent = xmalloc (sizeof *ent);
+  struct sql_list *ent = grecs_malloc (sizeof *ent);
   ent->conn = *conn;
   ent->next = sql_list;
   sql_list = ent;
@@ -198,7 +198,7 @@ sql_quote (struct dictionary *dict, void *handle, const char *input,
 
   len = strlen (input);
   size = 2 * len + 1;
-  output = xmalloc (size);
+  output = grecs_malloc (size);
   mysql_real_escape_string (&conn->mysql, output, input, len);
   *poutput = output;
   if (psize)
diff --git a/src/timer.c b/src/timer.c
index 1634462..cece63a 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
-#include <xalloc.h>
 
 struct timer_slot
 {
@@ -182,7 +181,7 @@ timer_format_time (double t)
         grecs_asprintf (&str, &size, "%02ld:%02ld", m, s);
     }
   if (!str)
-    xalloc_die ();
+    grecs_alloc_die ();
   return str;
 }
 
@@ -210,7 +209,7 @@ _fill_meta (void *sym, void *data)
               size_t size = 0;                                                \
               grecs_asprintf (&buf, &size, "timer:%s:%s", slot->name, #arg);      \
               if (!buf)                                                               \
-                xalloc_die ();                                                 \
+                grecs_alloc_die ();                                           \
               tp->def->kw = buf;                                              \
       tp->def->storage = timer_format_time (__cat2__(timer_get_,arg) (slot)); \
               tp->def->value = tp->def->storage;                              \
diff --git a/src/triplet.c b/src/triplet.c
index 3083c64..9dfdf2c 100644
--- a/src/triplet.c
+++ b/src/triplet.c
@@ -60,6 +60,7 @@ hash_triplet_free (void *data)
   for (up = tp->uploader_list; up; )
     {
       struct uploader_info *next = up->next;
+      free (up->fpr);
       free (up);
       up = next;
     }
@@ -94,7 +95,7 @@ register_file (struct file_info *finfo, const struct spool *spool)
         grecs_alloc_die ();
     }
 
-  key.name = xmalloc (finfo->root_len + 1);
+  key.name = grecs_malloc (finfo->root_len + 1);
   memcpy (key.name, finfo->name, finfo->root_len);
   key.name[finfo->root_len] = 0;
 
@@ -378,7 +379,7 @@ format_file_data (struct file_triplet *trp, enum file_type type, char **pret)
 
   /* Size */
   if (grecs_asprintf (&sptr, &slen, "%lu", (unsigned long) info->sb.st_size))
-    xalloc_die ();
+    grecs_alloc_die ();
 
   /* Figure out padding and format the buffer */
   slen = strlen (sptr);
@@ -391,7 +392,7 @@ format_file_data (struct file_triplet *trp, enum file_type type, char **pret)
                       modes, user_name, group_name, ugswidth - pad + slen,
                       sptr,
                       timebuf, info->name))
-    xalloc_die ();
+    grecs_alloc_die ();
   free (sptr);
   *pret = buf;
   return 0;
@@ -411,7 +412,7 @@ expand_triplet_ls_full (struct metadef *def, void *data)
   if (format_file_data (trp, file_directive, &buf[file_directive]) == 0)
     size += strlen (buf[file_directive]) + 1;
 
-  def->value = def->storage = xmalloc (size + 1);
+  def->value = def->storage = grecs_malloc (size + 1);
   def->value[0] = 0;
   if (buf[file_dist])
     {
@@ -446,7 +447,7 @@ expand_triplet_ls_upload (struct metadef *def, void *data)
   if (format_file_data (trp, file_signature, &buf[file_signature]) == 0)
     size += strlen (buf[file_signature]) + 1;
 
-  def->value = def->storage = xmalloc (size + 1);
+  def->value = def->storage = grecs_malloc (size + 1);
   def->value[0] = 0;
   if (buf[file_dist])
     {
@@ -552,7 +553,7 @@ expand_email_user (struct metadef *def, void *data)
       size_t size = 0;
       if (grecs_asprintf (&def->storage, &size, "\"%s\" <%s>",
                           trp->uploader->realname, trp->uploader->email))
-        xalloc_die ();
+        grecs_alloc_die ();
       def->value = def->storage;
     }
   return def->value;
@@ -594,7 +595,7 @@ expand_check_result (struct metadef *def, void *data)
       def->storage = NULL;
       if (grecs_asprintf (&def->storage, &size,
                           "%d", WEXITSTATUS (status)))
-        xalloc_die ();
+        grecs_alloc_die ();
     }
   else if (WIFSIGNALED (status))
     {
@@ -602,7 +603,7 @@ expand_check_result (struct metadef *def, void *data)
       def->storage = NULL;
       if (grecs_asprintf (&def->storage, &size, "SIG+%d",
                           WTERMSIG (status)))
-        xalloc_die ();
+        grecs_alloc_die ();
     }
   else
     return def->value = "[unrecognized return code]";
diff --git a/src/txtacc.c b/src/txtacc.c
index 91659f6..442e27e 100644
--- a/src/txtacc.c
+++ b/src/txtacc.c
@@ -34,8 +34,8 @@ struct txtacc
 static struct txtacc_entry *
 txtacc_alloc_entry (struct grecs_list *list, size_t size)
 {
-  struct txtacc_entry *p = xmalloc (sizeof (*p));
-  p->buf = xmalloc (size);
+  struct txtacc_entry *p = grecs_malloc (sizeof (*p));
+  p->buf = grecs_malloc (size);
   p->size = size;
   p->len = 0;
   grecs_list_append (list, p);
@@ -89,7 +89,7 @@ txtacc_entry_free (void *p)
 struct txtacc *
 txtacc_create ()
 {
-  struct txtacc *acc = xmalloc (sizeof (*acc));
+  struct txtacc *acc = grecs_malloc (sizeof (*acc));
   acc->cur = grecs_list_create ();
   acc->cur->free_entry = txtacc_entry_free;
   acc->mem = grecs_list_create ();
@@ -137,6 +137,7 @@ txtacc_finish (struct txtacc *acc, int steal)
       txtent = acc->cur->head->data;
       acc->cur->head->data = NULL;
       txtacc_entry_tailor (txtent);
+      grecs_list_append (acc->mem, txtent);
       break;
 
     default:
@@ -158,9 +159,10 @@ txtacc_finish (struct txtacc *acc, int steal)
   grecs_list_clear (acc->cur);
   p = txtent->buf;
   if (steal)
-    free (txtent);
-  else
-    grecs_list_append (acc->mem, txtent);
+    {
+      grecs_list_remove_tail (acc->mem);
+      free (txtent);
+    }    
   return p;
 }
 
@@ -173,7 +175,7 @@ txtacc_free_string (struct txtacc *acc, char *str)
       struct txtacc_entry *tp = ep->data;
       if (tp->buf == str)
         {
-          grecs_list_remove_entry(acc->mem, ep);
+          grecs_list_remove_entry (acc->mem, ep);
           free (tp->buf);
           return;
         }
diff --git a/src/verify.c b/src/verify.c
index a49983c..c8fef11 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -113,7 +113,7 @@ fill_project_name (struct file_triplet *trp)
       return 1;
     }
 
-  blurb = xmalloc (size + 1);
+  blurb = grecs_malloc (size + 1);
 
   rc = fread (blurb, size, 1, fp);
   fclose (fp);
@@ -182,7 +182,7 @@ fill_project_name (struct file_triplet *trp)
 struct uploader_info *
 new_uploader_info (struct uploader_info *src)
 {
-  struct uploader_info *p = xmalloc (sizeof (*p));
+  struct uploader_info *p = grecs_malloc (sizeof (*p));
   p->next = NULL;
   p->name = src->name;
   p->realname = src->realname;
diff --git a/src/wydawca.c b/src/wydawca.c
index cc1815b..36aa8b7 100644
--- a/src/wydawca.c
+++ b/src/wydawca.c
@@ -71,7 +71,7 @@ syslog_printer (int prio, const char *fmt, va_list ap)
       if (size > fmtsize)
         {
           fmtsize = size;
-          fmtbuf = x2realloc (fmtbuf, &fmtsize);
+          fmtbuf = grecs_realloc (fmtbuf, fmtsize);
         }
       sprintf (fmtbuf, "[%s] %s", p, fmt);
       fmt = fmtbuf;
@@ -179,7 +179,7 @@ stat_expand (struct metadef *def, void *data)
   def->storage = NULL;
   if (grecs_asprintf (&def->storage, &size, "%u",
                       wydawca_stat[(int) def->data]))
-    xalloc_die ();
+    grecs_alloc_die ();
   def->value = def->storage;
   return def->value;
 }
@@ -189,7 +189,7 @@ make_stat_expansion (size_t count)
 {
   int i;
   struct metadef *def, *p;
-  def = xcalloc (MAX_STAT + count + 1, sizeof (def[0]));
+  def = grecs_calloc (MAX_STAT + count + 1, sizeof (def[0]));
   p = def + count;
   for (i = 0; i < MAX_STAT; i++, p++)
     {
@@ -252,7 +252,7 @@ collect_uids (int argc, char **argv)
   int i;
     
   uidc = argc;
-  uidv = xcalloc (uidc, sizeof (uidv[0]));
+  uidv = grecs_calloc (uidc, sizeof (uidv[0]));
   for (i = 0; i < argc; i++)
     {
       struct passwd *pw = getpwnam (argv[i]);
diff --git a/src/wydawca.h b/src/wydawca.h
index 2307bad..94b7ee3 100644
--- a/src/wydawca.h
+++ b/src/wydawca.h
@@ -41,14 +41,13 @@
 #include <fcntl.h>
 #include <time.h>
 #include <sysexits.h>
+#include <fnmatch.h>
+#include <regex.h>
 
 #include <mailutils/types.h>
 #include <mailutils/url.h>
 #include <mailutils/errno.h>
 
-#include "error.h"
-#include "xalloc.h"
-#include "backupfile.h"
 #include "grecs.h"
 #include "wordsplit.h"
 
@@ -110,6 +109,21 @@ struct dictionary
 };
 
 
+enum backup_type
+  {
+    no_backups,               /* Don't make backups */
+    simple_backups,           /* Make only simple backups */
+    numbered_existing_backups,/* Make numbered backups for files that already
+                                 have such backups and simple backups for the
+                                 rest */
+    numbered_backups,         /* Make only numbered backups */
+  };
+
+extern char const *simple_backup_suffix;
+
+char *find_backup_file_name (char const *, enum backup_type);
+
+
 /* Archive types */
 
 enum archive_type
diff --git a/tests/.gitignore b/tests/.gitignore
index 7c8bd6b..1df6b71 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -9,3 +9,4 @@ dest
 wstest
 wsbatch
 pushck
+bkupname
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b174fcd..cc52dbf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = etc
 ## ------------ ##
 
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
-        {                                      \
+        $(AM_V_GEN){                                      \
           echo '# Signature of the current package.'; \
           echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
           echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
@@ -40,6 +40,10 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## ------------ ##
 
 TESTSUITE_AT = \
+  backup00.at\
+  backup01.at\
+  backup02.at\
+  backup03.at\
   check-fail.at\
   check-notify.at\
   check-ok.at\
@@ -73,9 +77,11 @@ check-local: atconfig atlocal $(TESTSUITE)
 #installcheck-local:
         #$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 
-check_PROGRAMS = wstest wsbatch pushck
-INCLUDES = -I$(top_srcdir)/grecs/src -I$(top_srcdir)/gnu -I../gnu -I$(top_srcdir)/src
-LDADD=../grecs/src/libgrecs.a ../gnu/libgnu.a
+check_PROGRAMS = wstest wsbatch pushck bkupname
+INCLUDES = -I$(top_srcdir)/grecs/src -I$(top_srcdir)/src
+LDADD=../grecs/src/libgrecs.a
 
 pushck_LDADD=../src/pushd.o
+bkupname_LDADD=../src/backup.o ../grecs/src/libgrecs.a
+
 
diff --git a/tests/backup01.at b/tests/backup01.at
new file mode 100644
index 0000000..7cf4f93
--- a/dev/null
+++ b/tests/backup01.at
@@ -0,0 +1,33 @@
+# This file is part of wydawca testsuite                -*- Autotest -*-
+# Copyright (C) 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/>.
+
+AT_SETUP(simple backups)
+AT_KEYWORDS([backup backup01 simple_backups])
+
+AT_CHECK([bkupname -simple a],
+[0],
+[a~
+])
+
+AT_CHECK([
+touch a
+bkupname -simple a
+],
+[0],
+[a~
+])
+
+AT_CLEANUP
diff --git a/tests/backup02.at b/tests/backup02.at
new file mode 100644
index 0000000..b5bcc54
--- a/dev/null
+++ b/tests/backup02.at
@@ -0,0 +1,43 @@
+# This file is part of wydawca testsuite                -*- Autotest -*-
+# Copyright (C) 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/>.
+
+AT_SETUP(numbered backups)
+AT_KEYWORDS([backup backup02 numbered_backups])
+
+AT_CHECK([bkupname -numbered a],
+[0],
+[a.~1~
+])
+
+AT_CHECK([
+touch a.~1~
+bkupname -numbered a
+],
+[0],
+[a.~2~
+])
+
+AT_CHECK([
+touch a.~99~
+bkupname -numbered a
+],
+[0],
+[a.~100~
+])
+
+
+
+AT_CLEANUP
diff --git a/tests/backup03.at b/tests/backup03.at
new file mode 100644
index 0000000..947c145
--- a/dev/null
+++ b/tests/backup03.at
@@ -0,0 +1,41 @@
+# This file is part of wydawca testsuite                -*- Autotest -*-
+# Copyright (C) 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/>.
+
+AT_SETUP(numbered existing backups)
+AT_KEYWORDS([backup backup03 numbered_existing_backups])
+
+AT_CHECK([bkupname -existing a],
+[0],
+[a~
+])
+
+AT_CHECK([
+touch a.~1~
+bkupname -existing a
+],
+[0],
+[a.~2~
+])
+
+AT_CHECK([
+touch a.~99~
+bkupname -existing a
+],
+[0],
+[a.~100~
+])
+
+AT_CLEANUP
diff --git a/tests/bkupname.c b/tests/bkupname.c
new file mode 100644
index 0000000..6187146
--- a/dev/null
+++ b/tests/bkupname.c
@@ -0,0 +1,79 @@
+/* wordsplit - a word splitter
+   Copyright (C) 2009, 2010 Sergey Poznyakoff
+
+   This program 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.
+
+   This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+#include "wydawca.h"
+
+char *progname;
+
+void
+usage (int code)
+{
+  FILE *fp = code ? stderr : stdout;
+
+  fprintf (fp, "usage: %s [-no] [-simple] [-existing] [-numbered] [-suffix=S] FILE\n",
+           progname);
+  exit (code);
+}
+
+int
+main (int argc, char **argv)
+{
+  enum backup_type type = numbered_backups;
+  char *file = NULL;
+  char *backup;
+  
+  progname = argv[0];
+  while (--argc)
+    {
+      char *arg = *++argv;
+      if (strcmp (arg, "-no") == 0)
+        type = no_backups;
+      else if (strcmp (arg, "-simple") == 0)
+        type = simple_backups;
+      else if (strcmp (arg, "-existing") == 0)
+        type = numbered_existing_backups;
+      else if (strcmp (arg, "-numbered") == 0)
+        type = numbered_backups;
+      else if (strncmp (arg, "-suffix=", 8) == 0)
+        simple_backup_suffix = arg + 8;
+      else if (arg[0] == '-')
+        usage (2);
+      else
+        {
+          if (argc != 1)
+            usage (2);
+          file = arg;
+        }
+    }
+
+  if (!file)
+    usage (2);
+  backup = find_backup_file_name (file, type);
+  if (!backup)
+    {
+      if (errno)
+        {
+          perror (file);
+          exit (1);
+        }
+      printf ("no backup\n");
+    }
+  else
+    printf ("%s\n", backup);
+  free (backup);
+  exit (0);
+}
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 240ab5d..2318762 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -24,6 +24,10 @@ AT_TESTED([wydawca])
 m4_include([version.at])
 m4_include([wordsplit.at])
 m4_include([pushdir.at])
+m4_include([backup00.at])
+m4_include([backup01.at])
+m4_include([backup02.at])
+m4_include([backup03.at])
 
 m4_include([upload-dry.at])
 m4_include([upload.at])