X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..5dcf161b0c2cc885e4dfa23fe4b4e1ab47e139c6:/sbr/fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 4c64b9c6..798f1f68 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -149,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 }
 };
 
@@ -423,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:
@@ -437,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: