X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_compile.c;h=836872892d15937e2260fc664b4c02e6ae731db9;hb=3a84d814004fd4557bf4f44952648e9e69bd22a8;hp=a478acb788c585e25aa9b1b4ceb639849236c6e3;hpb=cafee7a804b8aa53166065e988ec0fc387862fc8;p=mmh

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index a478acb..8368728 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -15,16 +13,10 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 /*
  * hash table for deciding if a component is "interesting"
@@ -53,6 +45,9 @@ extern struct mailname fmt_mnull;
 #define	TF_NOP     8	    /* like expr but no result            */
 
 /* ftable->flags */
+/* NB that TFL_PUTS is also used to decide whether the test
+ * in a "%<(function)..." should be a string or numeric one.
+ */
 #define	TFL_PUTS   1	    /* implicit putstr if top level */
 #define	TFL_PUTN   2	    /* implicit putnum if top level */
 
@@ -80,6 +75,7 @@ static struct ftable functable[] = {
      { "putnum",     TF_EXPR,	FT_NUM,		0,		0 },
      { "putnumf",    TF_EXPR,	FT_NUMF,	0,		0 },
      { "putaddr",    TF_STR,	FT_PUTADDR,	0,		0 },
+     { "putlit",     TF_STR,	FT_STRLIT,	0,		0 },
      { "void",       TF_NOP,	0,		0,		0 },
 
      { "comp",       TF_COMP,	FT_LS_COMP,	0,		TFL_PUTS },
@@ -144,44 +140,50 @@ static struct ftable functable[] = {
      { "ingrp",      TF_COMP,	FT_LV_INGRPF,	FT_PARSEADDR,	TFL_PUTN },
      { "nohost",     TF_COMP,	FT_LV_NOHOSTF,	FT_PARSEADDR,	TFL_PUTN },
      { "formataddr", TF_EXPR_SV,FT_FORMATADDR,	FT_FORMATADDR,	0 },
+     { "concataddr", TF_EXPR_SV,FT_CONCATADDR,	FT_FORMATADDR,	0 },
      { "friendly",   TF_COMP,	FT_LS_FRIENDLY,	FT_PARSEADDR,	TFL_PUTS },
 
      { "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 }
 };
 
 /* Add new component to the hash table */
-#define NEWCOMP(cm,name)\
+#define NEWCOMP(cm,name) do { \
 	cm = ((struct comp *) calloc(1, sizeof (struct comp)));\
 	cm->c_name = name;\
 	ncomp++;\
 	i = CHASH(name);\
 	cm->c_next = wantcomp[i];\
-	wantcomp[i] = cm;
+	wantcomp[i] = cm; \
+	} while (0)
 
 #define NEWFMT (next_fp++)
-#define NEW(type,fill,wid)\
-	fp=NEWFMT; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid);
+#define NEW(type,fill,wid) do {\
+	fp=NEWFMT; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
+	} while (0)
 
 /* Add (possibly new) component to the hash table */
-#define ADDC(name)\
+#define ADDC(name) do { \
 	FINDCOMP(cm, name);\
 	if (!cm) {\
 	    NEWCOMP(cm,name);\
 	}\
-	fp->f_comp = cm;
+	fp->f_comp = cm; \
+	} while (0)
 
-#define LV(type, value)		NEW(type,0,0); fp->f_value = (value);
-#define LS(type, str)		NEW(type,0,0); fp->f_text = (str);
+#define LV(type, value)		do { NEW(type,0,0); fp->f_value = (value); } while (0)
+#define LS(type, str)		do { NEW(type,0,0); fp->f_text = (str); } while (0)
 
-#define PUTCOMP(comp)		NEW(FT_COMP,0,0); ADDC(comp);
-#define PUTLIT(str)		NEW(FT_LIT,0,0); fp->f_text = (str);
-#define PUTC(c)			NEW(FT_CHAR,0,0); fp->f_char = (c);
+#define PUTCOMP(comp)		do { NEW(FT_COMP,0,0); ADDC(comp); } while (0)
+#define PUTLIT(str)		do { NEW(FT_LIT,0,0); fp->f_text = (str); } while (0)
+#define PUTC(c)			do { NEW(FT_CHAR,0,0); fp->f_char = (c); } while (0)
 
 static char *format_string;
-static char *usr_fstring;	/* for CERROR */
+static unsigned char *usr_fstring;	/* for CERROR */
 
 #define CERROR(str) compile_error (str, cp)
 
@@ -608,7 +610,14 @@ do_if(char *sp)
 		if (ftbl->f_type >= IF_FUNCS)
 		    fp->f_type = ftbl->extra;
 		else {
-		    LV (FT_IF_V_NE, 0);
+		    /* Put out a string test or a value test depending
+		     * on what this function's return type is.
+		     */
+		    if (ftbl->flags & TFL_PUTS) {
+			LV (FT_IF_S, 0);
+		    } else {
+			LV (FT_IF_V_NE, 0);
+		    }
 		}
 	    }
 	    else {