mhbuildsbr.c: Don't free(3) string then print it; do reverse.

[nmh] / h / aliasbr.h

diff --git a/h/aliasbr.h b/h/aliasbr.h
index 2e464d92e7eeeed3387bee623673bb6b1a1eeb99..6e7a5a320641f506fca46017180d4ea8ff4e3a7f 100644 (file)
--- a/h/aliasbr.h
+++ b/h/aliasbr.h
@@ -1,20 +1,14 @@
-
-/*
- * aliasbr.h -- definitions for the aliasing system
+/* aliasbr.h -- definitions for the aliasing system

  *
  *

- * $Id$

  */
 
 extern char *AliasFile;                /* mh-alias(5)             */
  */
 
 extern char *AliasFile;                /* mh-alias(5)             */

-#define        PASSWD  "/etc/passwd"   /* passwd(5)               */
-#define GROUP   "/etc/group"   /* group(5)                */
-#define EVERYONE 200           /* lowest uid for everyone */

 
 struct aka {
     char *ak_name;             /* name to match against             */
     struct adr *ak_addr;       /* list of addresses that it maps to */
     struct aka *ak_next;       /* next aka in list                  */
 
 struct aka {
     char *ak_name;             /* name to match against             */
     struct adr *ak_addr;       /* list of addresses that it maps to */
     struct aka *ak_next;       /* next aka in list                  */

-    char ak_visible;           /* should be visible in headers      */
+    bool ak_visible;           /* should be visible in headers      */

 };
 
 struct adr {
 };
 
 struct adr {


@@ -23,42 +17,18 @@ struct adr {
     char ad_local;             /* text is local (check for expansion) */
 };
 
     char ad_local;             /* text is local (check for expansion) */
 };
 

-/*
- * incore version of /etc/passwd
- */
-struct home {
-    char *h_name;              /* user name                             */
-    uid_t h_uid;               /* user id                               */
-    gid_t h_gid;               /* user's group                          */
-    char *h_home;              /* user's home directory                 */
-    char *h_shell;             /* user's shell                          */
-    int        h_ngrps;                /* number of groups this user belongs to */
-    struct home *h_next;       /* next home in list                     */
-};
-
-#ifndef        MMDFMTS
-struct home *seek_home ();
-#endif /* MMDFMTS */
-

 /*
  * prototypes
  */
 int alias (char *);
 /*
  * prototypes
  */
 int alias (char *);

-int akvisible (void);
-void init_pw (void);
+int akvisible (void) PURE;

 char *akresult (struct aka *);
 char *akvalue (char *);
 char *akerror (int);
 
 /* codes returned by alias() */
 
 char *akresult (struct aka *);
 char *akvalue (char *);
 char *akerror (int);
 
 /* codes returned by alias() */
 

-#define        AK_OK           0       /* file parsed ok        */
+#define        AK_OK           0       /* file parsed OK        */

 #define        AK_NOFILE       1       /* couldn't read file    */
 #define        AK_ERROR        2       /* error parsing file    */
 #define        AK_LIMIT        3       /* memory limit exceeded */
 #define        AK_NOFILE       1       /* couldn't read file    */
 #define        AK_ERROR        2       /* error parsing file    */
 #define        AK_LIMIT        3       /* memory limit exceeded */

-#define        AK_NOGROUP      4       /* no such group         */
-
-/* should live here, not in mts.c */
-
-extern int Everyone;
-extern char *NoShell;