X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Faliasbr.c;h=bda73261b8192060f945a8903af885dd8d3311c0;hp=8b32826b5f9122611ae92bf0aea0c26b24d6f4e2;hb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa;hpb=d5b5e6e4813b7fd77dc1664df4304537f3002cf3 diff --git a/uip/aliasbr.c b/uip/aliasbr.c index 8b32826..bda7326 100644 --- a/uip/aliasbr.c +++ b/uip/aliasbr.c @@ -11,6 +11,7 @@ #include #include #include +#include static int akvis; static char *akerrst; @@ -50,7 +51,7 @@ struct home *seek_home(char *); char * akvalue(char *s) { - register char *v; + char *v; akvis = -1; v = akval(akahead, s); @@ -70,8 +71,8 @@ akvisible(void) char * akresult(struct aka *ak) { - register char *cp = NULL, *dp, *pp; - register struct adr *ad; + char *cp = NULL, *dp, *pp; + struct adr *ad; for (ad = ak->ak_addr; ad; ad = ad->ad_next) { pp = ad->ad_local ? akval(ak->ak_next, ad->ad_text) @@ -109,7 +110,7 @@ akval(struct aka *ak, char *s) static int aleq(char *string, char *aliasent) { - register char c; + char c; while ((c = *string++)) if (*aliasent == '*') @@ -130,10 +131,10 @@ int alias(char *file) { int i; - register char *bp, *cp, *pp; + char *bp, *cp, *pp; char lc, *ap; - register struct aka *ak = NULL; - register FILE *fp; + struct aka *ak = NULL; + FILE *fp; if ((fp = fopen(file, "r")) == NULL) { akerrst = file; @@ -281,7 +282,7 @@ scanp(unsigned char *p) static char * getp(char *p) { - register unsigned char *cp = scanp(p); + unsigned char *cp = scanp(p); p = cp; while (!isspace(*cp) && *cp) @@ -295,7 +296,7 @@ getp(char *p) static char * seekp(char *p, char *c, char **a) { - register unsigned char *cp; + unsigned char *cp; p = cp = scanp(p); while (!isspace(*cp) && *cp && *cp != ':' && *cp != ';') @@ -311,9 +312,9 @@ seekp(char *p, char *c, char **a) static int addfile(struct aka *ak, char *file) { - register char *cp; + char *cp; char buffer[BUFSIZ]; - register FILE *fp; + FILE *fp; if (!(fp = fopen(etcpath(file), "r"))) { akerrst = file; @@ -332,9 +333,9 @@ addfile(struct aka *ak, char *file) static int addgroup(struct aka *ak, char *grp) { - register char *gp; - register struct group *gr = getgrnam(grp); - register struct home *hm = NULL; + char *gp; + struct group *gr = getgrnam(grp); + struct home *hm = NULL; if (!gr) gr = getgrgid(atoi(grp)); @@ -365,8 +366,8 @@ static int addmember(struct aka *ak, char *grp) { gid_t gid; - register struct group *gr = getgrnam(grp); - register struct home *hm = NULL; + struct group *gr = getgrnam(grp); + struct home *hm = NULL; if (gr) gid = gr->gr_gid; @@ -392,7 +393,7 @@ addmember(struct aka *ak, char *grp) static char * getalias(char *addrs) { - register unsigned char *pp, *qp; + unsigned char *pp, *qp; static char *cp = NULL; if (cp == NULL) @@ -424,7 +425,7 @@ getalias(char *addrs) static void add_aka(struct aka *ak, char *pp) { - register struct adr *ad, *ld; + struct adr *ad, *ld; for (ad = ak->ak_addr, ld = NULL; ad; ld = ad, ad = ad->ad_next) if (strcmp(pp, ad->ad_text)==0) @@ -444,7 +445,7 @@ add_aka(struct aka *ak, char *pp) void init_pw(void) { - register struct passwd *pw; + struct passwd *pw; static int init = 0; if (!init) { @@ -465,7 +466,7 @@ init_pw(void) static struct aka * akalloc(char *id) { - register struct aka *p; + struct aka *p; p = (struct aka *) mh_xmalloc(sizeof(*p)); @@ -486,7 +487,7 @@ akalloc(char *id) static struct home * hmalloc(struct passwd *pw) { - register struct home *p; + struct home *p; p = (struct home *) mh_xmalloc(sizeof(*p)); @@ -511,7 +512,7 @@ hmalloc(struct passwd *pw) struct home * seek_home(char *name) { - register struct home *hp; + struct home *hp; struct passwd *pw; char lname[32]; unsigned char *c;