5 files changed, 138 insertions, 124 deletions

diff --git a/Makefile.am b/Makefile.am
index c43b7a3..12f531c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with GSC.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=ckaliases
 AM_YFLAGS=-vtd
 AM_LFLAGS=-d
 sbin_PROGRAMS=ckaliases
 noinst_HEADERS=gram.h
 ckaliases_SOURCES=gram.y lex.l ckaliases.c ckaliases.h
+LDADD=../lib/libgsc.a ../gnu/libgnu.a
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gnu -I../gnu
diff --git a/ckaliases.c b/ckaliases.c
index 343a52f..d77e62d 100644
--- a/ckaliases.c
+++ b/ckaliases.c
@@ -1,5 +1,5 @@
 /* ckaliases - verify syntax of sendmail-style alias files
-   Copyright (C) 2005 Sergey Poznyakoff
+   Copyright (C) 2005, 2007 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
@@ -14,28 +14,8 @@
    You should have received a copy of the GNU General Public License along
    with this program. If not, see <http://www.gnu.org/licenses/>. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#define obstack_chunk_alloc malloc
-#define obstack_chunk_free free 
-#include <obstack.h>
 #include "ckaliases.h"
 
-void *
-xmalloc(size_t size)
-{
-        void *p = malloc(size);
-        if (!p) {
-                fprintf(stderr, "not enough memory\n");
-                exit(1);
-        }
-        return p;
-}
-
-
 #ifndef CHAR_BIT
 # define CHAR_BIT 8
 #endif
@@ -70,18 +50,23 @@ TC(unsigned *R, int n)
   cword = R;
   mask = 1;
   rowi = R;
-        while (rowi < relend) {
+  while (rowi < relend)
+    {
       ccol = cword;
       rowj = R;
 
-                while (rowj < relend) {
-                        if (*ccol & mask) {
+      while (rowj < relend)
+        {
+          if (*ccol & mask)
+            {
               rp = rowi;
               rend = (unsigned *) ((char *) rowj + rowsize);
 
               while (rowj < rend)
                 *rowj++ |= *rp++;
-                        } else {
+            }
+          else
+            {
               rowj = (unsigned *) ((char *) rowj + rowsize);
             }
 
@@ -89,7 +74,8 @@ TC(unsigned *R, int n)
         }
 
       mask <<= 1;
-                if (mask == 0) {
+      if (mask == 0)
+        {
           mask = 1;
           cword++;
         }
@@ -98,7 +84,6 @@ TC(unsigned *R, int n)
 }
 
 
-
 void
 slist_add (SLIST **plist, char *str)
 {
@@ -106,15 +91,19 @@ slist_add(SLIST **plist, char *str)
   p->str = str;
   p->next = NULL;
 
-        if (!*plist) {
+  if (!*plist)
+    {
       *plist = xmalloc (sizeof (**plist));
       (*plist)->head = NULL;
     }
 
-        if ((*plist)->head == NULL) {
+  if ((*plist)->head == NULL)
+    {
       (*plist)->head = p;
       (*plist)->count = 0;
-        } else {
+    }
+  else
+    {
       (*plist)->tail->next = p;
       (*plist)->count++;
     }
@@ -126,7 +115,8 @@ slist_append(SLIST **pdst, SLIST *src)
 {
   struct string_list *tail;
 
-        if (!*pdst) {
+  if (!*pdst)
+    {
       *pdst = xmalloc (sizeof (**pdst));
       (*pdst)->head = NULL;
       (*pdst)->count = 0;
@@ -161,7 +151,8 @@ slist_destroy(SLIST **plist)
   if (!plist || !*plist)
     return;
   p = (*plist)->head;
-        while (p) {
+  while (p)
+    {
       struct string_list *next = p->next;
       free (p);
       p = next;
@@ -171,9 +162,8 @@ slist_destroy(SLIST **plist)
 }
 
 
-
-
-typedef struct {
+typedef struct
+{
   char *name;
   SLIST *exp;
 } ALIAS;
@@ -238,7 +228,10 @@ end_aliases()
   qsort (aliases, alias_count, sizeof aliases[0], alias_cmp);
   for (i = 1; i < alias_count; i++)
     if (alias_cmp (aliases + i - 1, aliases + i) == 0)
-                        error("alias `%s' multiply defined", aliases[i].name);
+      {
+        error (0, 0, "alias `%s' multiply defined", aliases[i].name);
+        error_count++;
+      }
 }
 
 
@@ -273,10 +266,13 @@ mark_connected(unsigned *r, unsigned size)
 {
   int i;
 
-        for (i = 0; i < alias_count; i++) {
-                if (aliases[i].exp) {
+  for (i = 0; i < alias_count; i++)
+    {
+      if (aliases[i].exp)
+        {
           struct string_list *p;
-                        for (p = aliases[i].exp->head; p; p = p->next) {
+          for (p = aliases[i].exp->head; p; p = p->next)
+            {
               int n = find_alias (p->str);
               if (n >= 0)
                 alias_setbit (r, size, i, n);
@@ -290,9 +286,13 @@ check_circular_deps(unsigned *r, unsigned size)
 {
   int i;
 
-        for (i = 0; i < alias_count; i++) {
+  for (i = 0; i < alias_count; i++)
+    {
       if (alias_bitisset (r, size, i, i))
-                        error("%s: circular dependency", aliases[i].name);
+        {
+          error (0, 0, "%s: circular dependency", aliases[i].name);
+          error_count++;
+        }
     }
 }
 
diff --git a/ckaliases.h b/ckaliases.h
index 8d6546d..d3e053c 100644
--- a/ckaliases.h
+++ b/ckaliases.h
@@ -14,20 +14,44 @@
    You should have received a copy of the GNU General Public License along
    with this program. If not, see <http://www.gnu.org/licenses/>. */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#define obstack_chunk_alloc malloc
+#define obstack_chunk_free free
+#include <obstack.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>     
+#include <unistd.h>  
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <string.h>
+#include "getopt.h"