In mhshow, copy result of call to norm_charmap() and get_charset()

[nmh] / uip / aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 6600f741374247b7d6aacdb47c0c0260d39277b5..0f6b1909bc38ea16f224bb09c40014f9afc61283 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -41,7 +41,6 @@ static char *seekp (char *, char *, char **);
 static int addfile (struct aka *, char *);
 static int addgroup (struct aka *, char *);
 static int addmember (struct aka *, char *);
 static int addfile (struct aka *, char *);
 static int addgroup (struct aka *, char *);
 static int addmember (struct aka *, char *);

-static int addall (struct aka *);

 static char *getalias (char *);
 static void add_aka (struct aka *, char *);
 static struct aka *akalloc (char *);
 static char *getalias (char *);
 static void add_aka (struct aka *, char *);
 static struct aka *akalloc (char *);


@@ -271,10 +270,6 @@ alias (char *file)
                }
                break;
 
                }
                break;
 

-           case '*':           /* Everyone */
-               addall (ak);
-               break;
-

            default:            /* list */
                while ((cp = getalias (pp)))
                    add_aka (ak, cp);
            default:            /* list */
                while ((cp = getalias (pp)))
                    add_aka (ak, cp);


@@ -439,26 +434,6 @@ addmember (struct aka *ak, char *grp)
 }
 
 
 }
 
 

-static int
-addall (struct aka *ak)
-{
-    int noshell = NoShell == NULL || *NoShell == 0;
-    register struct home *hm;
-
-    init_pw ();
-
-    if (Everyone < 0)
-       Everyone = EVERYONE;
-
-    for (hm = homehead; hm; hm = hm->h_next)
-        if ((int) hm->h_uid > Everyone
-               && (noshell || strcmp (hm->h_shell, NoShell)))
-           add_aka (ak, hm->h_name);
-
-    return homehead != NULL;
-}
-
-

 static char *
 getalias (char *addrs)
 {
 static char *
 getalias (char *addrs)
 {