From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 22 Feb 2013 03:40:48 +0000 (-0500)
Subject: Merge branch 'format-test'
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a?ds=inline;hp=--cc

Merge branch 'format-test'
---

2e768e3cc0ce768373d3320eca4cdd08b8cf646a
diff --cc docs/README.manpages
index 6d6111df,33693df3..6bb6636b
--- a/docs/README.manpages
+++ b/docs/README.manpages
@@@ -8,8 -8,9 +8,10 @@@ nmh manpages should be in this general 
  .\"
  .SH NAME
  comp \- compose a message
 +.\"
  .SH SYNOPSIS
+ .HP 5
+ .na
  .B comp 
  .RI [ +folder ]
  .RI [ msgs ]
diff --cc sbr/fmt_scan.c
index 6cceff32,e654b15e..dad7a3c6
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@@ -351,10 -328,13 +351,11 @@@ get_x400_comp (char *mbox, char *key, c
  }
  
  struct format *
- fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat)
+ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
+ 	  struct fmt_callbacks *callbacks)
  {
 -    char *cp, *ep;
 -    unsigned char *sp;
 -    char *savestr = NULL;
 -    unsigned char *str = NULL;
 +    char *cp, *ep, *sp;
 +    char *savestr = NULL, *str = NULL;
      char buffer[BUFSIZ], buffer2[BUFSIZ];
      int i, c, ljust, n;
      int value = 0;
diff --cc uip/mhlsbr.c
index 6babf510,fc0a1a10..5dbf341c
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@@ -1881,9 -1871,9 +1883,9 @@@ filterbody (struct mcomp *c1, char *buf
  	 * Pull out each argument and scan them.
  	 */
  
 -	for (a = arglist_head, i = 1; a != NULL; a = a->a_next, i++) {
 +	for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) {
  	    args[i] = mh_xmalloc(BUFSIZ);
- 	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat);
+ 	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
  	    /*
  	     * fmt_scan likes to put a trailing newline at the end of the
  	     * format string.  If we have one, get rid of it.
diff --cc uip/replsbr.c
index eff1877e,21170376..a7a214bf
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@@ -69,9 -71,10 +71,10 @@@ replout (FILE *inb, char *msg, char *dr
      struct format *fmt;
      register char **ap;
      int	char_read = 0, format_len, mask;
 -    char name[NAMESZ], *scanl;
 -    unsigned char *cp;
 +    char name[NAMESZ], *scanl, *cp;
      static int dat[5];			/* aux. data for format routine */
 +    m_getfld_state_t gstate = 0;
+     struct fmt_callbacks cb;
  
      FILE *out;
      NMH_UNUSED (msg);