X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=da02d2798391206f2862149d84b9b1c14d775683;hp=fe2e34b5347ab42059151435a76f9788af00f03e;hb=9fca5fd33b87291cdcb326c7aab6ab9574244289;hpb=3e017a7abbdf69bf0dff7a4073275961eda1ded8 diff --git a/uip/spost.c b/uip/spost.c index fe2e34b..da02d27 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -24,17 +24,13 @@ static struct swit switches[] = { { "verbose", 0 }, #define NVERBSW 1 { "noverbose", 2 }, -#define ALIASW 2 - { "alias aliasfile", 0 }, -#define NALIASW 3 - { "noalias", 2 }, -#define VERSIONSW 4 +#define VERSIONSW 2 { "Version", 0 }, -#define HELPSW 5 +#define HELPSW 3 { "help", 0 }, -#define DEBUGSW 6 +#define DEBUGSW 4 { "debug", -5 }, -#define DISTSW 7 +#define DISTSW 5 { "dist", -4 }, /* interface from dist */ { NULL, 0 } }; @@ -181,18 +177,6 @@ main(int argc, char **argv) case NVERBSW: verbose = 0; continue; - - case ALIASW: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - aliasflg = 1; - if ((state = alias(cp)) != AK_OK) - adios(NULL, "aliasing error in file %s - %s", cp, akerror(state)); - continue; - case NALIASW: - aliasflg = 0; - continue; } } if (msg) @@ -214,6 +198,21 @@ main(int argc, char **argv) tmpfil = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out)); } + /* check for "Aliasfile:" profile entry */ + if ((cp = context_find("Aliasfile"))) { + char *dp, **ap; + + aliasflg = 1; + for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; + ap++) { + if ((state = alias(etcpath(*ap))) != AK_OK) { + adios(NULL, "aliasing error in file %s: %s", + *ap, akerror(state)); + } + } + } + + hdrtab = (msgstate == normal) ? NHeaders : RHeaders; for (compnum = 1, state = FLD;;) {