From: David Levine <levinedl@acm.org>
Date: Sat, 7 Jan 2012 14:22:24 +0000 (-0600)
Subject: Merge branch 'fileproc_mhlproc_to_post'
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=03fe41ba1d68108808c966c6d7ff74bd8c1d648c;hp=-c;p=mmh

Merge branch 'fileproc_mhlproc_to_post'
---

03fe41ba1d68108808c966c6d7ff74bd8c1d648c
diff --combined man/mh-profile.man
index 4299a30,40b56c7..2cd02eb
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@@ -154,17 -154,17 +154,17 @@@ composition draft before it is sent
  .RE
  .PP
  .BR Msg\-Protect :
 -644
 +600
  .RS 5
  An octal number which defines the permission bits for new message files.
  See
  .BR chmod (1)
  for an explanation of the octal number.
 -(profile, default: 0644)
 +(profile, default: 0600)
  .RE
  .PP
  .BR Folder\-Protect :
 -750
 +700
  .RS 5
  An octal number which defines the permission bits for new folder
  directories.  See
@@@ -223,6 -223,21 +223,6 @@@ command
  (context, no default)
  .RE
  .PP
 -.BR mhe :
 -.RS 5
 -If present, tells
 -.B inc
 -to compose an
 -.I MHE
 -auditfile in addition to its other tasks. 
 -.I MHE
 -is Brian Reid's 
 -.B emacs
 -front-end for
 -.BR nmh .
 -(profile, no default)
 -.RE
 -.PP
  .BR Alternate\-Mailboxes :
  mh@uci\-750a, bug-mh*
  .RS 5
@@@ -317,8 -332,11 +317,8 @@@ environment variabl
  If
  .B $SIGNATURE
  is not set and this profile entry is not present, the \*(lqgcos\*(rq field of
 -the \fI/etc/passwd\fP file will be used; otherwise, on hosts where
 -.B nmh
 -was configured with the UCI option, the file
 -.I $HOME/.signature
 -is consulted.  Your signature will be added to the address
 +the \fI/etc/passwd\fP file will be used.
 +Your signature will be added to the address
  .B send
  puts in the \*(lqFrom:\*(rq header; do not include an address in the
  signature text.  (profile, no default)
@@@ -348,7 -366,7 +348,7 @@@ to process drafts which are MIME compos
  .RS 5
  This program is used to refile or link a message to another folder.
  It is used by
- .B post
+ .B send
  to file a copy of a message into a folder given
  by a \*(lqFcc:\*(rq field.  It is used by the draft folder facility in
  .BR comp ,
@@@ -435,14 -453,10 +435,10 @@@ message that you are forwarding, or to 
  When the
  .B \-filter
  option is given to
- .B send
- or
- .BR post ,
+ .BR send ,
  the
  .I mhlproc
- is used by
- .B post
- to filter the copy of the message
+ is used to filter the copy of the message
  that is sent to \*(lqBcc:\*(rq recipients.
  .RE
  .PP
diff --combined uip/send.c
index ad1cf39,9d634ed..39d425f
--- a/uip/send.c
+++ b/uip/send.c
@@@ -153,6 -153,9 +153,6 @@@ main (int argc, char **argv
      struct stat st;
      char	*attach = (char *)0;	/* header field name for attachments */
      int attachformat = 0; /* mhbuild format specifier for attachments */
 -#ifdef UCI
 -    FILE *fp;
 -#endif /* UCI */
  
  #ifdef LOCALE
      setlocale(LC_ALL, "");
@@@ -168,6 -171,16 +168,16 @@@
      vec[vecp++] = "-library";
      vec[vecp++] = getcpy (m_maildir (""));
  
+     if ((cp = context_find ("fileproc"))) {
+       vec[vecp++] = "-fileproc";
+       vec[vecp++] = cp;
+     }
+ 
+     if ((cp = context_find ("mhlproc"))) {
+       vec[vecp++] = "-mhlproc";
+       vec[vecp++] = cp;
+     }
+ 
      while ((cp = *argp++)) {
  	if (*cp == '-') {
  	    switch (smatch (++cp, switches)) {
@@@ -398,6 -411,18 +408,6 @@@ go_to_it
      if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
  	if ((cp = context_find ("signature")) && *cp)
  	    m_putenv ("SIGNATURE", cp);
 -#ifdef UCI
 -	else {
 -	    snprintf (buf, sizeof(buf), "%s/.signature", mypath);
 -	    if ((fp = fopen (buf, "r")) != NULL
 -		&& fgets (buf, sizeof buf, fp) != NULL) {
 -		    fclose (fp);
 -		    if (cp = strchr (buf, '\n'))
 -			*cp = 0;
 -		    m_putenv ("SIGNATURE", buf);
 -	    }
 -	}
 -#endif /* UCI */
  
      for (msgnum = 0; msgnum < msgp; msgnum++)
  	if (stat (msgs[msgnum], &st) == NOTOK)
diff --combined uip/whatnowsbr.c
index 18c25f8,ad7570a..7db5c58
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@@ -726,6 -726,13 +726,6 @@@ editfile (char **ed, char **arg, char *
  
  	default:
  	    if ((status = pidwait (pid, NOTOK))) {
 -#ifdef ATTVIBUG
 -		if ((cp = r1bindex (*ed, '/'))
 -			&& strcmp (cp, "vi") == 0
 -			&& (status & 0x00ff) == 0)
 -		    status = 0;
 -		else {
 -#endif
  		if (((status & 0xff00) != 0xff00)
  		    && (!reedit || (status & 0x00ff))) {
  		    if (!use && (status & 0xff00) &&
@@@ -737,6 -744,9 +737,6 @@@
  		}
  		status = -2;	/* maybe "reedit ? -2 : -1"? */
  		break;
 -#ifdef ATTVIBUG
 -		}
 -#endif
  	    }
  
  	    reedit++;
@@@ -1097,6 -1107,9 +1097,6 @@@ sendit (char *sp, char **arg, char *fil
  #ifndef	lint
      int	distsw = 0;
  #endif
 -#ifdef UCI
 -    FILE *fp;
 -#endif
  
      /*
       * Make sure these are defined.  In particular, we need
@@@ -1144,6 -1157,16 +1144,16 @@@
      vec[vecp++] = "-library";
      vec[vecp++] = getcpy (m_maildir (""));
  
+     if ((cp = context_find ("fileproc"))) {
+       vec[vecp++] = "-fileproc";
+       vec[vecp++] = cp;
+     }
+ 
+     if ((cp = context_find ("mhlproc"))) {
+       vec[vecp++] = "-mhlproc";
+       vec[vecp++] = cp;
+     }
+ 
      while ((cp = *argp++)) {
  	if (*cp == '-') {
  	    switch (smatch (++cp, sendswitches)) {
@@@ -1287,6 -1310,18 +1297,6 @@@
      if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
  	if ((cp = context_find ("signature")) && *cp)
  	    m_putenv ("SIGNATURE", cp);
 -#ifdef UCI
 -	else {
 -	    snprintf (buf, sizeof(buf), "%s/.signature", mypath);
 -	    if ((fp = fopen (buf, "r")) != NULL
 -		&& fgets (buf, sizeof(buf), fp) != NULL) {
 -		    fclose (fp);
 -		    if (cp = strchr (buf, '\n'))
 -			*cp = 0;
 -		    m_putenv ("SIGNATURE", buf);
 -	    }
 -	}
 -#endif /* UCI */
  
      if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
  	annotext = NULL;