Use "grecs" submodule for configuration parsing.

* Makefile.am (ACLOCAL_AMFLAGS): Add -I grecs/am.
(SUBDIRS): grecs
(ChangeLog): New rule.
* ChangeLog: Rename to ChangeLog.svn
* doc: Rename to etc.
* etc/upgrade.awk: New file.
* bootstrap.conf: Initialize "grecs".
* configure.ac: Call GRECS_SETUP.
(AC_CONFIG_FILES): Add grecs/Makefile and grecs/src/Makefile.
* gnulib.modules: Add gitlog-to-changelog and sysexits.
* src/Makefile.am (LDADD, INCLUDES): Add grecs.
(AM_CPPFLAGS): Define additional variables.
* src/log.c (use_stderr): Remove. Use log_to_stderr instead.
(grecs_print_diag): New function.
* src/main.c: Redo command-line support.
(listen_sockaddr): New global.
* src/readconfig.c: Rewrite.
* src/tagr.h: Include sysexits.h and grecs.h
(listen_sockaddr, log_to_stderr, pidfile): New externs.
* src/main.c, src/stat.c, src/report.c: Use sysexits codes.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/tagr.h b/src/tagr.h
index ea201d4..3dc4561 100644
--- a/src/tagr.h
+++ b/src/tagr.h
@@ -1,5 +1,5 @@
 /* This file is part of tagr.
-   Copyright (C) 2000, 2005,  Max Bouglacoff, Sergey Poznyakoff
+   Copyright (C) 2000, 2005, 2009 Max Bouglacoff, 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
@@ -19,6 +19,8 @@
 #include <time.h>
 #include <errno.h>
 #include <xalloc.h>
+#include <sysexits.h>
+#include <grecs.h>
 
 #define LOGFACILITY LOG_LOCAL5
 #define TAGR_CONFIGFILE SYSCONFDIR "/tagr.conf"
@@ -27,6 +29,9 @@
 #define TAGR_DBNAME "tagr.db"
 #define TAGR_DBMODE 0600
 
+#define _(s) s
+#define N_(s) s
+
 typedef struct HostData
 {
   char *id;
@@ -38,6 +43,11 @@ typedef struct HostData
   unsigned max;
 } SD;
 
+extern struct grecs_sockaddr listen_sockaddr;
+extern int preprocess_only;
+extern int log_to_stderr;
+extern char *pidfile;
+
 extern char rateup[];
 extern char *user;
 extern char *basedir;