-
-/*
- * ali.c -- list nmh mail aliases
+/* ali.c -- list nmh mail aliases
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
#include <h/mts.h>
#include <h/utils.h>
-/*
- * maximum number of names
- */
-#define NVEC 50
-
-static struct swit switches[] = {
-#define ALIASW 0
- { "alias aliasfile", 0 },
-#define NALIASW 1
- { "noalias", -7 },
-#define LISTSW 2
- { "list", 0 },
-#define NLISTSW 3
- { "nolist", 0 },
-#define NORMSW 4
- { "normalize", 0 },
-#define NNORMSW 5
- { "nonormalize", 0 },
-#define USERSW 6
- { "user", 0 },
-#define NUSERSW 7
- { "nouser", 0 },
-#define VERSIONSW 8
- { "version", 0 },
-#define HELPSW 9
- { "help", 0 },
- { NULL, 0 }
-};
+#define ALI_SWITCHES \
+ X("alias aliasfile", 0, ALIASW) \
+ X("noalias", 0, NALIASW) \
+ X("list", 0, LISTSW) \
+ X("nolist", 0, NLISTSW) \
+ X("user", 0, USERSW) \
+ X("nouser", 0, NUSERSW) \
+ X("version", 0, VERSIONSW) \
+ X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(ALI);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(ALI, switches);
+#undef X
static int pos = 1;
/*
* prototypes
*/
-static void print_aka (char *, int, int);
-static void print_usr (char *, int, int);
+static void print_aka (char *, bool, int);
+static void print_usr (char *, bool);
int
main (int argc, char **argv)
{
- int i, vecp = 0, inverted = 0, list = 0;
- int noalias = 0, normalize = AD_NHST;
+ int i, vecp = 0;
+ bool inverted, list, noalias;
char *cp, **ap, **argp, buf[BUFSIZ];
- char *vec[NVEC], **arguments;
+ /* Really only need to allocate for argc-1, but must allocate at least 1,
+ so go ahead and allocate for argc char pointers. */
+ char **vec = mh_xmalloc (argc * sizeof (char *)), **arguments;
struct aka *ak;
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], 1)) { return 1; }
- mts_init (invo_name);
+ mts_init ();
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
+ inverted = list = noalias = false;
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
snprintf (buf, sizeof(buf), "%s [switches] aliases ...",
invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version (invo_name);
- done (1);
+ done (0);
case ALIASW:
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "aliasing error in %s - %s", cp, akerror (i));
continue;
case NALIASW:
- noalias++;
+ noalias = true;
continue;
case LISTSW:
- list++;
+ list = true;
continue;
case NLISTSW:
- list = 0;
- continue;
-
- case NORMSW:
- normalize = AD_HOST;
- continue;
- case NNORMSW:
- normalize = AD_NHST;
+ list = false;
continue;
case USERSW:
- inverted++;
+ inverted = true;
continue;
case NUSERSW:
- inverted = 0;
+ inverted = false;
continue;
}
}
- vec[vecp++] = cp;
+
+ if (vecp < argc) {
+ vec[vecp++] = cp;
+ } else {
+ /* Should never happen, but try to protect against code changes
+ that could allow it. */
+ adios (NULL, "too many arguments");
+ }
}
if (!noalias) {
if ((cp = context_find ("Aliasfile"))) {
char *dp = NULL;
- for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++)
+ for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++)
if ((i = alias (*ap)) != AK_OK)
adios (NULL, "aliasing error in %s - %s", *ap, akerror (i));
- if (dp)
- free(dp);
+ free(dp);
}
alias (AliasFile);
}
invo_name);
for (i = 0; i < vecp; i++)
- print_usr (vec[i], list, normalize);
-
- done (0);
- }
-
- if (vecp) {
- /* print specified aliases */
- for (i = 0; i < vecp; i++)
- print_aka (akvalue (vec[i]), list, 0);
+ print_usr (vec[i], list);
} else {
- /* print them all */
- for (ak = akahead; ak; ak = ak->ak_next) {
- printf ("%s: ", ak->ak_name);
- pos += strlen (ak->ak_name) + 1;
- print_aka (akresult (ak), list, pos);
+ if (vecp) {
+ /* print specified aliases */
+ for (i = 0; i < vecp; i++)
+ print_aka (akvalue (vec[i]), list, 0);
+ } else {
+ /* print them all */
+ for (ak = akahead; ak; ak = ak->ak_next) {
+ char *res;
+
+ printf ("%s: ", ak->ak_name);
+ pos += strlen (ak->ak_name) + 1;
+ res = akresult(ak);
+ print_aka(res, list, pos);
+ free(res);
+ }
}
}
+ free (vec);
done (0);
return 1;
}
static void
-print_aka (char *p, int list, int margin)
+print_aka (char *p, bool list, int margin)
{
char c;
if (p == NULL) {
- printf ("<empty>\n");
+ puts("<empty>");
return;
}
}
static void
-print_usr (char *s, int list, int norm)
+print_usr (char *s, bool list)
{
- register char *cp, *pp, *vp;
- register struct aka *ak;
- register struct mailname *mp, *np;
+ char *cp, *pp, *vp;
+ struct aka *ak;
+ struct mailname *mp, *np;
if ((pp = getname (s)) == NULL)
adios (NULL, "no address in \"%s\"", s);
- if ((mp = getm (pp, NULL, 0, norm, NULL)) == NULL)
+ if ((mp = getm (pp, NULL, 0, NULL, 0)) == NULL)
adios (NULL, "bad address \"%s\"", s);
while (getname (""))
continue;
for (ak = akahead; ak; ak = ak->ak_next) {
pp = akresult (ak);
while ((cp = getname (pp))) {
- if ((np = getm (cp, NULL, 0, norm, NULL)) == NULL)
+ if ((np = getm (cp, NULL, 0, NULL, 0)) == NULL)
continue;
- if (!mh_strcasecmp (mp->m_host, np->m_host)
- && !mh_strcasecmp (mp->m_mbox, np->m_mbox)) {
+ if (!strcasecmp (FENDNULL(mp->m_host),
+ FENDNULL(np->m_host)) &&
+ !strcasecmp (FENDNULL(mp->m_mbox),
+ FENDNULL(np->m_mbox))) {
vp = vp ? add (ak->ak_name, add (",", vp))
: getcpy (ak->ak_name);
mnfree (np);
}
mnfree (mp);
-#if 0
- printf ("%s: ", s);
- print_aka (vp ? vp : s, list, pos += strlen (s) + 1);
-#else
print_aka (vp ? vp : s, list, 0);
-#endif
- if (vp)
- free (vp);
+ free(vp);
}
projects / nmh / blobdiff