1 files changed, 208 insertions, 208 deletions

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
@@ -51,131 +31,141 @@ xmalloc(size_t size)
    to be the transitive closure of what was given.  */
 
 void
-TC(unsigned *R, int n)
+TC (unsigned *R, int n)
 {
-        register int rowsize;
-        register unsigned mask;
-        register unsigned *rowj;
-        register unsigned *rp;
-        register unsigned *rend;
-        register unsigned *ccol;
-
-        unsigned *relend;
-        unsigned *cword;
-        unsigned *rowi;
-
-        rowsize = WORDSIZE(n) * sizeof(unsigned);
-        relend = (unsigned *) ((char *) R + (n * rowsize));
-
-        cword = R;
-        mask = 1;
-        rowi = R;
-        while (rowi < relend) {
-                ccol = cword;
-                rowj = R;
-                
-                while (rowj < relend) {
-                        if (*ccol & mask) {
-                                rp = rowi;
-                                rend = (unsigned *) ((char *) rowj + rowsize);
-                                
-                                while (rowj < rend)
-                                        *rowj++ |= *rp++;
-                        } else {
-                                rowj = (unsigned *) ((char *) rowj + rowsize);
-                        }
-                        
-                        ccol = (unsigned *) ((char *) ccol + rowsize);
-                }
-                
-                mask <<= 1;
-                if (mask == 0) {
-                        mask = 1;
-                        cword++;
-                }
-                rowi = (unsigned *) ((char *) rowi + rowsize);
-        }
-}
+  register int rowsize;
+  register unsigned mask;
+  register unsigned *rowj;
+  register unsigned *rp;
+  register unsigned *rend;
+  register unsigned *ccol;
+
+  unsigned *relend;
+  unsigned *cword;
+  unsigned *rowi;
+
+  rowsize = WORDSIZE (n) * sizeof (unsigned);
+  relend = (unsigned *) ((char *) R + (n * rowsize));
+
+  cword = R;
+  mask = 1;
+  rowi = R;
+  while (rowi < relend)
+    {
+      ccol = cword;
+      rowj = R;
+
+      while (rowj < relend)
+        {
+          if (*ccol & mask)
+            {
+              rp = rowi;
+              rend = (unsigned *) ((char *) rowj + rowsize);
+
+              while (rowj < rend)
+                *rowj++ |= *rp++;
+            }
+          else
+            {
+              rowj = (unsigned *) ((char *) rowj + rowsize);
+            }
+
+          ccol = (unsigned *) ((char *) ccol + rowsize);
+        }
 
+      mask <<= 1;
+      if (mask == 0)
+        {
+          mask = 1;
+          cword++;
+        }
+      rowi = (unsigned *) ((char *) rowi + rowsize);
+    }
+}
 
 
 void
-slist_add(SLIST **plist, char *str)
+slist_add (SLIST **plist, char *str)
 {
-        struct string_list *p = xmalloc(sizeof(*p));
-        p->str = str;
-        p->next = NULL;
-        
-        if (!*plist) {
-                *plist = xmalloc(sizeof(**plist));
-                (*plist)->head = NULL;
-        }
-
-        if ((*plist)->head == NULL) {
-                (*plist)->head = p;
-                (*plist)->count = 0;
-        } else {
-                (*plist)->tail->next = p;
-                (*plist)->count++;
-        }
-        (*plist)->tail = p;
+  struct string_list *p = xmalloc (sizeof (*p));
+  p->str = str;
+  p->next = NULL;
+
+  if (!*plist)
+    {
+      *plist = xmalloc (sizeof (**plist));
+      (*plist)->head = NULL;
+    }
+
+  if ((*plist)->head == NULL)
+    {
+      (*plist)->head = p;
+      (*plist)->count = 0;
+    }
+  else
+    {
+      (*plist)->tail->next = p;
+      (*plist)->count++;
+    }
+  (*plist)->tail = p;
 }
 
 void
-slist_append(SLIST **pdst, SLIST *src)
+slist_append (SLIST **pdst, SLIST *src)
 {
-        struct string_list *tail;
-        
-        if (!*pdst) {
-                *pdst = xmalloc(sizeof(**pdst));
-                (*pdst)->head = NULL;
-                (*pdst)->count = 0;
-        }
+  struct string_list *tail;
+
+  if (!*pdst)
+    {
+      *pdst = xmalloc (sizeof (**pdst));
+      (*pdst)->head = NULL;
+      (*pdst)->count = 0;
+    }
+
+  if ((*pdst)->head = NULL)
+    (*pdst)->head = src->head;
+
+  for (tail = src->tail; tail->next; tail = tail->next)
+    ;
 
-        if ((*pdst)->head = NULL) 
-                (*pdst)->head = src->head;
-        
-        for (tail = src->tail; tail->next; tail = tail->next)
-                ;
-        
-        (*pdst)->tail = tail;
-        (*pdst)->count += src->count;
+  (*pdst)->tail = tail;
+  (*pdst)->count += src->count;
 }
 
 char *
-slist_member(SLIST *plist, char *name)
+slist_member (SLIST *plist, char *name)
 {
-        struct string_list *p;
-        
-        if (plist)
-                for (p = plist->head; p; p = p->next)
-                        if (p->str && strcmp(p->str, name) == 0)
-                                return p->str;
-        return NULL; 
+  struct string_list *p;
+
+  if (plist)
+    for (p = plist->head; p; p = p->next)
+      if (p->str && strcmp (p->str, name) == 0)
+        return p->str;
+  return NULL;
 }
 
 void
-slist_destroy(SLIST **plist)
+slist_destroy (SLIST **plist)
 {
-        struct string_list *p;
-        if (!plist || !*plist)
-                return;
-        p = (*plist)->head;
-        while (p) {
-                struct string_list *next = p->next;
-                free(p);
-                p = next;
-        }
-        free(*plist);
-        *plist = NULL;
+  struct string_list *p;
+  if (!plist || !*plist)
+    return;
+  p = (*plist)->head;
+  while (p)
+    {
+      struct string_list *next = p->next;
+      free (p);
+      p = next;
+    }
+  free (*plist);
+  *plist = NULL;
 }
-                
-
 
 
-typedef struct {
-        char *name;
-        SLIST *exp;
+typedef struct
+{
+  char *name;
+  SLIST *exp;
 } ALIAS;
 
 struct obstack alias_stk;
@@ -183,139 +173,149 @@ unsigned alias_count;
 ALIAS *aliases;