X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffmt_compile.c;h=798f1f6888d57a1bb1ee0b671c2444371f6217f0;hp=6baabdc76ebbe91c9ca1c4be8ee3b46d4a49441c;hb=1513f7668c494c4583141d6115669b7198c14556;hpb=f812b86689024085d891b870d183792584cf67fb diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index 6baabdc..798f1f6 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -3,6 +3,10 @@ * fmt_compile.c -- "compile" format strings for fmt_scan * * $Id$ + * + * This code is Copyright (c) 2002, by the authors of nmh. See the + * COPYRIGHT file in the root directory of the nmh distribution for + * complete copyright information. */ #include @@ -145,6 +149,8 @@ static struct ftable functable[] = { { "mymbox", TF_COMP, FT_LV_COMPFLAG, FT_MYMBOX, TFL_PUTN }, { "addtoseq", TF_STR, FT_ADDTOSEQ, 0, 0 }, + { "unquote", TF_EXPR, FT_LS_UNQUOTE, 0, TFL_PUTS}, + { NULL, 0, 0, 0, 0 } }; @@ -419,13 +425,11 @@ do_name(char *sp, int preprocess) if (cm->c_type & CT_ADDR) { CERROR("component used as both date and address"); } - if (! (cm->c_type & CT_DATE)) { - cm->c_tws = (struct tws *) - calloc((size_t) 1, sizeof(*cm->c_tws)); - fp->f_type = preprocess; - PUTCOMP(sp); - cm->c_type |= CT_DATE; - } + cm->c_tws = (struct tws *) + calloc((size_t) 1, sizeof(*cm->c_tws)); + fp->f_type = preprocess; + PUTCOMP(sp); + cm->c_type |= CT_DATE; break; case FT_MYMBOX: @@ -433,18 +437,15 @@ do_name(char *sp, int preprocess) ismymbox ((struct mailname *) 0); primed++; } - cm->c_type |= CT_MYMBOX; /* fall through */ case FT_PARSEADDR: if (cm->c_type & CT_DATE) { CERROR("component used as both date and address"); } - if (! (cm->c_type & CT_ADDRPARSE)) { - cm->c_mn = &fmt_mnull; - fp->f_type = preprocess; - PUTCOMP(sp); - cm->c_type |= (CT_ADDR | CT_ADDRPARSE); - } + cm->c_mn = &fmt_mnull; + fp->f_type = preprocess; + PUTCOMP(sp); + cm->c_type |= CT_ADDR; break; case FT_FORMATADDR: