projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* uip/sendsbr.c (annoaux): Fix the call to annotate()
[mmh]
/
sbr
/
fmt_compile.c
diff --git
a/sbr/fmt_compile.c
b/sbr/fmt_compile.c
index
d3e5ea9
..
798f1f6
100644
(file)
--- a/
sbr/fmt_compile.c
+++ b/
sbr/fmt_compile.c
@@
-3,11
+3,15
@@
* fmt_compile.c -- "compile" format strings for fmt_scan
*
* $Id$
* 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 <h/mh.h>
#include <h/addrsbr.h>
*/
#include <h/mh.h>
#include <h/addrsbr.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
#include <h/fmt_scan.h>
#include <h/fmt_compile.h>
#include <h/fmt_scan.h>
#include <h/fmt_compile.h>
@@
-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 },
{ "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 }
};
{ NULL, 0, 0, 0, 0 }
};
@@
-270,6
+276,7
@@
fmt_compile(char *fstring, struct format **fmt)
* normal processing.
*/
i = strlen(fstring)/2 + 1;
* normal processing.
*/
i = strlen(fstring)/2 + 1;
+ if (i==1) i++;
next_fp = formatvec = (struct format *)calloc ((size_t) i,
sizeof(struct format));
if (next_fp == NULL)
next_fp = formatvec = (struct format *)calloc ((size_t) i,
sizeof(struct format));
if (next_fp == NULL)
@@
-418,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_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:
break;
case FT_MYMBOX:
@@
-432,18
+437,15
@@
do_name(char *sp, int preprocess)
ismymbox ((struct mailname *) 0);
primed++;
}
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");
}
/* 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:
break;
case FT_FORMATADDR: