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.

1 files changed, 17 insertions, 3 deletions

diff --git a/src/wydawca.h b/src/wydawca.h
index 2307bad..94b7ee3 100644
--- a/src/wydawca.h
+++ b/src/wydawca.h
@@ -20,56 +20,55 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <getopt.h>
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>
 #include <signal.h>
 #include <limits.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #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"
 
 #define SP(s) ((s) ? (s) : "NONE")
 
 #define WYDAWCA_EX_AGAIN 1
 
 /* The range of directive versions we accept (major * 100 + minor) */
 #define MIN_DIRECTIVE_VERSION 101
 #define MAX_DIRECTIVE_VERSION 101
 
 /* Default modes for mkdir and creat commands: rely on the umask value */
 #define MKDIR_PERMISSIONS 0777
 #define CREAT_PERMISSIONS 0666
 
 #define SUF_SIG ".sig"
 #define SUF_SIG_LEN (sizeof (SUF_SIG) - 1)
 #define SUF_DIR ".directive.asc"
 #define SUF_DIR_LEN (sizeof (SUF_DIR) - 1)
 
 #define __cat2__(a,b) a ## b
 #define __cat3__(a,b,c) a ## b ## c
 #define NITEMS(a) (sizeof(a)/sizeof((a)[0]))
 
@@ -89,48 +88,63 @@ enum dictionary_type
     dictionary_external        /* Invoke an external program */
   };
 
 struct dictionary
 {
   enum dictionary_id id;
   enum dictionary_type type;      /* Dictionary type */
   char *query;                    /* Query template */
   int parmc;                      /* Number of entries in paramv */
   char **parmv;                   /* Parameters. The semantics differs
 				     depending on type. For SQL:
 				      0 - Identifier of the SQL struct
 				          to use; */
 
   int init_passed;                /* Initialization count */
   char *result;                   /* Result storage */
   size_t result_size;             /* Size of result */
   unsigned ncol;                  /* Number of columns per row */
   unsigned nrow;                  /* Number of rows */
 
   void *storage;
 };
 
 
+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
   {
     archive_none,         /* No archivation requested */
     archive_directory,    /* Archive by moving files to a separate directory
 			     hierarchy */
     archive_tar           /* Archive by appending to a tar file (tar -r) */
   };
 
 struct archive_descr
 {
   enum archive_type type;        /* Archivation type */
   char *name;                    /* Directory name if type==archive_directory,
 				    archive file name if type==archive_tar */
   enum backup_type backup_type;  /* Requested backup type if
 				    type == archive_directory */
 };
 
 
 /* Type of file in a triplet */
 enum file_type
   {
     file_dist,             /* Something to be distributed */