Factor trim format function out

[mmh] / h / aliasbr.h

diff --git a/h/aliasbr.h b/h/aliasbr.h
index cc4da7f..759c9a7 100644 (file)
--- a/h/aliasbr.h
+++ b/h/aliasbr.h
@@ -1,61 +1,49 @@
-
 /*
- * aliasbr.h -- definitions for the aliasing system
- *
- */
-
-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 */
+** aliasbr.h -- definitions for the aliasing system
+*/
 
 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      */
+       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      */
 };
 
 struct adr {
-    char *ad_text;             /* text of this address in list        */
-    struct adr *ad_next;       /* next adr in list                    */
-    char ad_local;             /* text is local (check for expansion) */
+       char *ad_text;          /* text of this address in list        */
+       struct adr *ad_next;    /* next adr in list                    */
+       char ad_local;          /* text is local (check for expansion) */
 };
 
 /*
- * incore version of /etc/passwd
- */
+** 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                     */
+       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                     */
 };
 
-struct home *seek_home (char *);
+struct home *seek_home(char *);
 
 /*
- * prototypes
- */
-int alias (char *);
-int akvisible (void);
-void init_pw (void);
-char *akresult (struct aka *);
-char *akvalue (char *);
-char *akerror (int);
+** prototypes
+*/
+int alias(char *);
+int akvisible(void);
+void init_pw(void);
+char *akresult(struct aka *);
+char *akvalue(char *);
+char *akerror(int);
 
 /* codes returned by alias() */
 
-#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_NOGROUP      4       /* no such group         */
-
-/* should live here, not in mts.c */
-
-extern int Everyone;
-extern char *NoShell;
+#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_NOGROUP  4   /* no such group         */