X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7086ee95576e95aec1b54ad73c6fa6ead9186a3d..e6d87a04919616cf2a6ea6cbda81d5fbc31cc8a2:/sbr/fmt_compile.c?ds=inline

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 75adc08e..fbb12742 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -159,6 +159,8 @@ static struct ftable functable[] = {
      { "decodecomp", TF_COMP,	FT_LS_DECODECOMP, 0,		TFL_PUTS },
      { "decode",     TF_EXPR,	FT_LS_DECODE,	0,		TFL_PUTS },
      { "trim",       TF_EXPR,	FT_LS_TRIM,	0,		0 },
+     { "kilo",       TF_EXPR,	FT_LS_KILO,	0,		TFL_PUTS },
+     { "kibi",       TF_EXPR,	FT_LS_KIBI,	0,		TFL_PUTS },
      { "compval",    TF_COMP,	FT_LV_COMP,	0,		TFL_PUTN },
      { "compflag",   TF_COMP,	FT_LV_COMPFLAG,	0,		TFL_PUTN },
      { "num",        TF_NUM,	FT_LV_LIT,	0,		TFL_PUTN },
@@ -175,6 +177,7 @@ static struct ftable functable[] = {
      { "localmbox",  TF_LMBOX,	FT_LS_LIT,	0,		TFL_PUTS },
      { "plus",       TF_NUM,	FT_LV_PLUS_L,	0,		TFL_PUTN },
      { "minus",      TF_NUM,	FT_LV_MINUS_L,	0,		TFL_PUTN },
+     { "multiply",   TF_NUM,	FT_LV_MULTIPLY_L, 0,		TFL_PUTN },
      { "divide",     TF_NUM,	FT_LV_DIVIDE_L,	0,		TFL_PUTN },
      { "modulo",     TF_NUM,	FT_LV_MODULO_L,	0,		TFL_PUTN },
      { "charleft",   TF_NONE,	FT_LV_CHAR_LEFT, 0,		TFL_PUTN },
@@ -221,6 +224,8 @@ static struct ftable functable[] = {
      { "friendly",   TF_COMP,	FT_LS_FRIENDLY,	FT_PARSEADDR,	TFL_PUTS },
 
      { "mymbox",     TF_COMP,	FT_LV_COMPFLAG,	FT_MYMBOX,	TFL_PUTN },
+     { "getmymbox",  TF_COMP,	FT_STR,		FT_GETMYMBOX,	0 },
+     { "getmyaddr",  TF_COMP,	FT_LS_ADDR,	FT_GETMYADDR,	TFL_PUTS },
 
      { "unquote",    TF_EXPR, 	FT_LS_UNQUOTE,	0,		TFL_PUTS },
 
@@ -282,7 +287,7 @@ static struct colormap colortable[] = {
 
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
-	cm = ((struct comp *) calloc(1, sizeof (struct comp)));\
+	cm = ((struct comp *) mh_xcalloc (1, sizeof (struct comp)));\
 	cm->c_name = getcpy(name);\
 	cm->c_refcount++;\
 	ncomp++;\
@@ -364,11 +369,7 @@ compile_error(char *str, char *cp)
     usr_fstring[errpos] = '\0';
 
     for (i = errpos-errctx; i < errpos; i++) {
-#ifdef LOCALE
 	if (iscntrl((unsigned char) usr_fstring[i]))
-#else
-	if (usr_fstring[i] < 32)
-#endif
 	    usr_fstring[i] = '_';
     }
 
@@ -398,8 +399,6 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 	comptable_initialized = 1;
     }
 
-    memset((char *) &fmt_mnull, 0, sizeof(fmt_mnull));
-
     /* it takes at least 4 char to generate one format so we
      * allocate a worst-case format array using 1/4 the length
      * of the format string.  We actually need twice this much
@@ -408,7 +407,7 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
      */
     i = strlen(fstring)/2 + 1;
 		if (i==1) i++;
-    next_fp = formatvec = (struct format *)calloc ((size_t) i,
+    next_fp = formatvec = (struct format *)mh_xcalloc ((size_t) i,
 						   sizeof(struct format));
     if (next_fp == NULL)
 	adios (NULL, "unable to allocate format storage");
@@ -564,14 +563,19 @@ do_name(char *sp, int preprocess)
 	if (cm->c_type & CT_ADDR) {
 	    CERROR("component used as both date and address");
 	}
-	cm->c_tws = (struct tws *)
-	    calloc((size_t) 1, sizeof(*cm->c_tws));
+	if (cm->c_tws) {
+	    memset (cm->c_tws, 0, sizeof *cm->c_tws);
+	} else {
+	    cm->c_tws = mh_xcalloc (1, sizeof *cm->c_tws);
+	}
 	fp->f_type = preprocess;
 	PUTCOMP(sp);
 	cm->c_type |= CT_DATE;
 	break;
 
     case FT_MYMBOX:
+    case FT_GETMYMBOX:
+    case FT_GETMYADDR:
 	if (!primed) {
 	    ismymbox ((struct mailname *) 0);
 	    primed++;
@@ -1091,6 +1095,25 @@ fmt_appendcomp(int bucket, char *component, char *text)
     }
 }
 
+/*
+ * Iterate over our component hash table
+ */
+
+struct comp *
+fmt_nextcomp(struct comp *comp, unsigned int *bucket)
+{
+    if (comp == NULL)
+	*bucket = 0;
+    else
+	comp = comp->c_next;
+
+    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+	comp = wantcomp[(*bucket)++];
+    }
+
+    return comp;
+}
+
 /*
  * Free and reset our component hash table
  */