[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] nmh ./ChangeLog h/aliasbr.h h/rcvmail.h man/Mak...
|
From: |
Oliver Kiddle |
|
Subject: |
[Nmh-commits] nmh ./ChangeLog h/aliasbr.h h/rcvmail.h man/Mak... |
|
Date: |
Mon, 16 Jan 2006 10:00:47 +0000 |
CVSROOT: /cvsroot/nmh
Module name: nmh
Branch:
Changes by: Oliver Kiddle <address@hidden> 06/01/16 10:00:47
Modified files:
. : ChangeLog
h : aliasbr.h rcvmail.h
man : Makefile.in slocal.man
sbr : lock_file.c
uip : aliasbr.c dropsbr.c post.c slocal.c
Removed files:
man : mh-mts.man
Log message:
remove remnants of code for MMDF
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.224&tr2=1.225&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/h/aliasbr.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/h/rcvmail.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/man/Makefile.in.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/man/slocal.man.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/lock_file.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/aliasbr.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/dropsbr.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/post.c.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/slocal.c.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.224 nmh/ChangeLog:1.225
--- nmh/ChangeLog:1.224 Mon Jan 16 09:55:24 2006
+++ nmh/ChangeLog Mon Jan 16 10:00:46 2006
@@ -1,7 +1,11 @@
2006-01-16 Oliver Kiddle <address@hidden>
+ * h/aliasbr.h, h/rcvmail.h, man/Makefile.in, man/slocal.man,
+ sbr/lock_file.c, uip/aliasbr.c, uip/dropsbr.c, uip/post.c,
+ uip/slocal.c, man/mh-mts.man: remove remnants of code for MMDF
+
* uip/scansbr.c: multiply buffer size by MB_CUR_MAX so multi-byte
- chars fit
+ chars fit
2006-01-14 Josh Bressers <address@hidden>
Index: nmh/h/aliasbr.h
diff -u nmh/h/aliasbr.h:1.2 nmh/h/aliasbr.h:1.3
--- nmh/h/aliasbr.h:1.2 Wed Nov 9 22:56:35 2005
+++ nmh/h/aliasbr.h Mon Jan 16 10:00:46 2006
@@ -2,7 +2,7 @@
/*
* aliasbr.h -- definitions for the aliasing system
*
- * $Id: aliasbr.h,v 1.2 2005/11/09 22:56:35 pm215 Exp $
+ * $Id: aliasbr.h,v 1.3 2006/01/16 10:00:46 opk Exp $
*/
extern char *AliasFile; /* mh-alias(5) */
@@ -36,9 +36,7 @@
struct home *h_next; /* next home in list */
};
-#ifndef MMDFMTS
struct home *seek_home (char *);
-#endif /* MMDFMTS */
/*
* prototypes
Index: nmh/h/rcvmail.h
diff -u nmh/h/rcvmail.h:1.2 nmh/h/rcvmail.h:1.3
--- nmh/h/rcvmail.h:1.2 Mon Jun 12 18:11:43 2000
+++ nmh/h/rcvmail.h Mon Jan 16 10:00:46 2006
@@ -2,7 +2,7 @@
/*
* rcvmail.h -- rcvmail hook definitions
*
- * $Id: rcvmail.h,v 1.2 2000/06/12 18:11:43 ruud Exp $
+ * $Id: rcvmail.h,v 1.3 2006/01/16 10:00:46 opk Exp $
*/
#if defined(SMTPMTS)
@@ -14,22 +14,12 @@
# include <mts/smtp/smtp.h>
#endif /* SMTPMTS */
-#ifdef MMDFMTS
-# include <mts/mmdf/util.h>
-# include <mts/mmdf/mmdf.h>
-#endif /* MMDFMTS */
-
#if defined(SMTPMTS)
# define RCV_MOK 0
# define RCV_MBX 1
#endif /* SMTPMTS */
-#ifdef MMDFI
-# define RCV_MOK RP_MOK
-# define RCV_MBX RP_MECH
-#endif /* MMDFI */
-
#ifdef NRTC /* sigh */
# undef RCV_MOK
Index: nmh/man/Makefile.in
diff -u nmh/man/Makefile.in:1.18 nmh/man/Makefile.in:1.19
--- nmh/man/Makefile.in:1.18 Tue Nov 8 16:58:08 2005
+++ nmh/man/Makefile.in Mon Jan 16 10:00:46 2006
@@ -1,7 +1,7 @@
#
# Makefile for man subdirectory
#
-# $Id: Makefile.in,v 1.18 2005/11/08 16:58:08 opk Exp $
+# $Id: Makefile.in,v 1.19 2006/01/16 10:00:46 opk Exp $
#
VERSION = @VERSION@
@@ -69,7 +69,7 @@
mh-tailor. mts.conf.
MAN8SRC = ap. conflict. dp. fmtdump. \
- mh-mts. post.
+ post.
MAN1 = $(MAN1SRC:.=.$(manext1))
MAN5 = $(MAN5SRC:.=.$(manext5))
Index: nmh/man/slocal.man
diff -u nmh/man/slocal.man:1.7 nmh/man/slocal.man:1.8
--- nmh/man/slocal.man:1.7 Mon Sep 8 18:41:10 2003
+++ nmh/man/slocal.man Mon Jan 16 10:00:47 2006
@@ -1,6 +1,6 @@
.\"
.\" %nmhwarning%
-.\" $Id: slocal.man,v 1.7 2003/09/08 18:41:10 kenh Exp $
+.\" $Id: slocal.man,v 1.8 2006/01/16 10:00:47 opk Exp $
.\"
.TH SLOCAL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
.SH NAME
@@ -120,44 +120,22 @@
file.
.SS "Message Transfer Agents"
-If your MTA is
+Most modern MTAs including
.BR sendmail ,
-you should include the line
+.BR postfix
+and
+.BR exim
+support a \&.forward file for directing incoming mail.
+You should include the line
.PP
.RS 5
\*(lq|\ %libdir%/slocal\ \-user\ username\*(rq
.RE
.PP
in your \&.forward file in your home directory. This will cause
-.B sendmail
-to invoke
+your MTA to invoke
.B slocal
on your behalf when a message arrives.
-.PP
-If your MTA is
-.BR MMDF-I ,
-you should (symbolically) link
-.B %libdir%/slocal
-to the file
-.B bin/rcvmail
-in your home directory. This will
-cause
-.B MMDF-I
-to invoke
-.B slocal
-on your behalf with the correct
-.RI \*(lq "address\ info\ sender" \*(rq
-arguments.
-.PP
-If your MTA is
-.BR MMDF-II ,
-then you should not use
-.B slocal.
-An equivalent functionality is already provided by
-.BR MMDF-II ;
-see
-.BR maildelivery (5)
-for details.
.SS "The Maildelivery File"
The
Index: nmh/sbr/lock_file.c
diff -u nmh/sbr/lock_file.c:1.12 nmh/sbr/lock_file.c:1.13
--- nmh/sbr/lock_file.c:1.12 Mon Jan 2 03:17:42 2006
+++ nmh/sbr/lock_file.c Mon Jan 16 10:00:47 2006
@@ -2,7 +2,7 @@
/*
* lock.c -- routines to lock/unlock files
*
- * $Id: lock_file.c,v 1.12 2006/01/02 03:17:42 bress Exp $
+ * $Id: lock_file.c,v 1.13 2006/01/16 10:00:47 opk Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -36,11 +36,6 @@
# include <errno.h>
#endif
-#ifdef MMDFONLY
-# include <mmdfonly.h>
-# include <lockonly.h>
-#endif /* MMDFONLY */
-
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#else
Index: nmh/uip/aliasbr.c
diff -u nmh/uip/aliasbr.c:1.5 nmh/uip/aliasbr.c:1.6
--- nmh/uip/aliasbr.c:1.5 Mon Jan 2 03:17:42 2006
+++ nmh/uip/aliasbr.c Mon Jan 16 10:00:47 2006
@@ -2,7 +2,7 @@
/*
* aliasbr.c -- new aliasing mechanism
*
- * $Id: aliasbr.c,v 1.5 2006/01/02 03:17:42 bress Exp $
+ * $Id: aliasbr.c,v 1.6 2006/01/16 10:00:47 opk Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -47,9 +47,7 @@
static void add_aka (struct aka *, char *);
static struct aka *akalloc (char *);
static struct home *hmalloc (struct passwd *);
-#ifndef MMDFMTS
struct home *seek_home (char *);
-#endif
/* Do mh alias substitution on 's' and return the results. */
@@ -561,7 +559,6 @@
}
-#ifndef MMDFMTS
struct home *
seek_home (char *name)
{
@@ -598,4 +595,3 @@
return NULL;
}
-#endif /* MMDFMTS */
Index: nmh/uip/dropsbr.c
diff -u nmh/uip/dropsbr.c:1.9 nmh/uip/dropsbr.c:1.10
--- nmh/uip/dropsbr.c:1.9 Mon Jan 2 03:25:18 2006
+++ nmh/uip/dropsbr.c Mon Jan 16 10:00:47 2006
@@ -2,7 +2,7 @@
/*
* dropsbr.c -- create/read/manipulate mail drops
*
- * $Id: dropsbr.c,v 1.9 2006/01/02 03:25:18 bress Exp $
+ * $Id: dropsbr.c,v 1.10 2006/01/16 10:00:47 opk Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -12,16 +12,10 @@
#include <h/nmh.h>
#include <h/utils.h>
-#ifndef MMDFONLY
-# include <h/mh.h>
-# include <h/dropsbr.h>
-# include <h/mts.h>
-# include <h/tws.h>
-#else
-# include "dropsbr.h"
-# include "strings.h"
-# include "mmdfonly.h"
-#endif
+#include <h/mh.h>
+#include <h/dropsbr.h>
+#include <h/mts.h>
+#include <h/tws.h>
#ifdef HAVE_ERRNO_H
# include <errno.h>
Index: nmh/uip/post.c
diff -u nmh/uip/post.c:1.15 nmh/uip/post.c:1.16
--- nmh/uip/post.c:1.15 Fri Jan 6 21:51:44 2006
+++ nmh/uip/post.c Mon Jan 16 10:00:47 2006
@@ -2,7 +2,7 @@
/*
* post.c -- enter messages into the mail transport system
*
- * $Id: post.c,v 1.15 2006/01/06 21:51:44 bress Exp $
+ * $Id: post.c,v 1.16 2006/01/16 10:00:47 opk Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -36,19 +36,10 @@
# endif
#endif
-#ifdef MMDFMTS
-# include <mts/mmdf/util.h>
-# include <mts/mmdf/mmdf.h>
-#endif
-
#ifdef SMTPMTS
# include <mts/smtp/smtp.h>
#endif
-#ifndef MMDFMTS
-# define uptolow(c) ((isalpha(c) && isupper (c)) ? tolower (c) : (c))
-#endif
-
#ifndef CYRUS_SASL
# define SASLminc(a) (a)
#else /* CYRUS_SASL */
@@ -211,11 +202,7 @@
{ "Resent-Fcc", HFCC, 0 },
{ "Reply-To", HADR, 0 },
{ "From", HADR|HNGR, MFRM },
-#ifdef MMDFI
- { "Sender", HADR|HNGR|HMNG, 0 },
-#else
{ "Sender", HADR|HNGR, 0 },
-#endif
{ "Date", HNOP, MDAT },
{ "To", HADR|HNIL, 0 },
{ "cc", HADR|HNIL, 0 },
@@ -274,11 +261,6 @@
static struct mailname uuaddrs={NULL}; /* uucp addrs */
static struct mailname tmpaddrs={NULL}; /* temporary queue */
-#ifdef MMDFMTS
-static char *submitmode = "m"; /* deliver to mailbox only */
-static char submitopts[6] = "vl"; /* initial options for submit */
-#endif /* MMDFMTS */
-
#ifdef SMTPMTS
static int snoop = 0;
static int smtpmode = S_MAIL;
@@ -347,10 +329,6 @@
arguments = getarguments (invo_name, argc, argv, 0);
argp = arguments;
-#if defined(MMDFMTS) && defined(MMDFII)
- mmdf_init (invo_name);
-#endif /* MMDFMTS and MMDFII */
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
@@ -469,19 +447,6 @@
adios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
-#ifdef MMDFMTS
- case MAILSW:
- submitmode = "m";
- continue;
- case SOMLSW: /* for right now, sigh... */
- case SAMLSW:
- submitmode = "b";
- continue;
- case SENDSW:
- submitmode = "y";
- continue;
-#endif /* MMDFMTS */
-
case DLVRSW:
if (!(cp = *argp++) || *cp == '-')
adios (NULL, "missing argument to %s", argp[-2]);
@@ -654,12 +619,6 @@
done (0);
}
-#ifdef MMDFMTS
- strcat (submitopts, submitmode);
- if (watch)
- strcat (submitopts, "nw");
-#endif /* MMDFMTS */
-
if (msgflags & MINV) {
make_bcc_file (dashstuff);
if (msgflags & MVIS) {
@@ -949,10 +908,6 @@
if (whomsw && !fill_up)
break;
-#ifdef MMDFI /* sigh */
- fprintf (out, "Sender: %s\n", from);
-#endif /* MMDFI */
-
fprintf (out, "Resent-Date: %s\n", dtime (&tclock, 0));
if (msgid)
fprintf (out, "Resent-Message-ID: <address@hidden>\n",
@@ -1399,11 +1354,6 @@
chkadr ();
-#ifdef MMDFMTS
- if (rp_isbad (retval = mm_waend ()))
- die (NULL, "problem ending addresses [%s]\n", rp_valstr (retval));
-#endif /* MMDFMTS */
-
#ifdef SMTPMTS
if (rp_isbad (retval = sm_waend ()))
die (NULL, "problem ending addresses; %s", rp_string (retval));
@@ -1607,276 +1557,6 @@
#endif /* SMTPMTS */
-/*
- * MMDF routines
- */
-
-#ifdef MMDFMTS
-
-static void
-post (char *file, int bccque, int talk)
-{
- int fd, onex;
- int retval;
-#ifdef RP_NS
- int len;
- struct rp_bufstruct reply;
-#endif /* RP_NS */
-
- onex = !(msgflags & MINV) || bccque;
- if (verbose) {
- if (msgflags & MINV)
- printf (" -- Posting for %s Recipients --\n",
- bccque ? "Blind" : "Sighted");
- else
- printf (" -- Posting for All Recipients --\n");
- }
-
- sigon ();
-
- if (rp_isbad (retval = mm_init ())
- || rp_isbad (retval = mm_sbinit ())
- || rp_isbad (retval = mm_winit (NULL, submitopts, from)))
- die (NULL, "problem initializing MMDF system [%s]",
- rp_valstr (retval));
-#ifdef RP_NS
- if (rp_isbad (retval = mm_rrply (&reply, &len)))
- die (NULL, "problem with sender address [%s]",
- rp_valstr (retval));
-#endif /* RP_NS */
-
- do_addresses (bccque, talk && verbose);
- if ((fd = open (file, O_RDONLY)) == NOTOK)
- die (file, "unable to re-open");
- do_text (file, fd);
- close (fd);
- fflush (stdout);
-
- mm_sbend ();
- mm_end (OK);
- sigoff ();
-
- if (verbose)
- if (msgflags & MINV)
- printf (" -- %s Recipient Copies Posted --\n",
- bccque ? "Blind" : "Sighted");
- else
- printf (" -- Recipient Copies Posted --\n");
- fflush (stdout);
-}
-
-
-/* Address Verification */
-
-static void
-verify_all_addresses (int talk)
-{
- int retval;
- struct mailname *lp;
-
-#ifdef RP_NS
- int len;
- struct rp_bufstruct reply;
-#endif /* RP_NS */
-
- sigon ();
-
- if (!whomsw || checksw) {
- if (rp_isbad (retval = mm_init ())
- || rp_isbad (retval = mm_sbinit ())
- || rp_isbad (retval = mm_winit (NULL, submitopts, from)))
- die (NULL, "problem initializing MMDF system [%s]",
- rp_valstr (retval));
-#ifdef RP_NS
- if (rp_isbad (retval = mm_rrply (&reply, &len)))
- die (NULL, "problem with sender address [%s]", rp_valstr (retval));
-#endif /* RP_NS */
- }
-
- if (talk && !whomsw)
- printf (" -- Address Verification --\n");
- if (talk && localaddrs.m_next)
- printf (" -- Local Recipients --\n");
- for (lp = localaddrs.m_next; lp; lp = lp->m_next)
- do_an_address (lp, talk);
-
- if (talk && uuaddrs.m_next)
- printf (" -- UUCP Recipients --\n");
- for (lp = uuaddrs.m_next; lp; lp = lp->m_next)
- do_an_address (lp, talk);
-
- if (talk && netaddrs.m_next)
- printf (" -- Network Recipients --\n");
- for (lp = netaddrs.m_next; lp; lp = lp->m_next)
- do_an_address (lp, talk);
-
- chkadr ();
- if (talk && !whomsw)
- printf (" -- Address Verification Successful --\n");
-
- if (!whomsw || checksw)
- mm_end (NOTOK);
-
- fflush (stdout);
- sigoff ();
-}
-
-
-static void
-do_an_address (struct mailname *lp, int talk)
-{
- int len, retval;
- char *mbox, *host, *text, *path;
- char addr[BUFSIZ];
- struct rp_bufstruct reply;
-
- switch (lp->m_type) {
- case LOCALHOST:
- mbox = lp->m_mbox;
- host = LocalName ();
- strncpy (addr, mbox, sizeof(addr));
- break;
-
- case UUCPHOST:
- fprintf (talk ? stdout : stderr, " %s!%s: %s\n",
- lp->m_host, lp->m_mbox, "not supported; UUCP address");
- unkadr++;
- fflush (stdout);
- return;
-
- default: /* let MMDF decide if the host is bad */
- mbox = lp->m_mbox;
- host = lp->m_host;
- snprintf (addr, sizeof(addr), "%s at %s", mbox, host);
- break;
- }
-
- if (talk)
- printf (" %s%s", addr, whomsw && lp->m_bcc ? "[BCC]" : "");
-
- if (whomsw && !checksw) {
- putchar ('\n');
- return;
- }
- if (talk)
- printf (": ");
- fflush (stdout);
-
-#ifdef MMDFII
- if (lp->m_path)
- path = concat (lp->m_path, mbox, "@", host, NULL);
- else
-#endif /* MMDFII */
- path = NULL;
- if (rp_isbad (retval = mm_wadr (path ? NULL : host, path ? path : mbox))
- || rp_isbad (retval = mm_rrply (&reply, &len)))
- die (NULL, "problem submitting address [%s]", rp_valstr (retval));
-
- switch (rp_gval (reply.rp_val)) {
- case RP_AOK:
- if (talk)
- printf ("address ok\n");
- fflush (stdout);
- return;
-
-#ifdef RP_DOK
- case RP_DOK:
- if (talk)
- printf ("nameserver timeout - queued for checking\n");
- fflush (stdout);
- return;
-#endif /* RP_DOK */
-
- case RP_NO:
- text = "you lose";
- break;
-
-#ifdef RP_NS
- case RP_NS:
- text = "temporary nameserver failure";
- break;
-
-#endif /* RP_NS */
-
- case RP_USER:
- case RP_NDEL:
- text = "not deliverable";
- break;
-
- case RP_AGN:
- text = "try again later";
- break;
-
- case RP_NOOP:
- text = "nothing done";
- break;
-
- default:
- if (!talk)
- fprintf (stderr, " %s: ", addr);
- text = "unexpected response";
- die (NULL, "%s;\n [%s] -- %s", text,
- rp_valstr (reply.rp_val), reply.rp_line);
- }
-
- if (!talk)
- fprintf (stderr, " %s: ", addr);
- fprintf (talk ? stdout : stderr, "%s;\n %s\n", text, reply.rp_line);
- unkadr++;
-
- fflush (stdout);
-}
-
-
-static void
-do_text (char *file, int fd)
-{
- int retval, state;
- char buf[BUFSIZ];
- struct rp_bufstruct reply;
-
- lseek (fd, (off_t) 0, SEEK_SET);
-
- while ((state = read (fd, buf, sizeof(buf))) > 0) {
- if (rp_isbad (mm_wtxt (buf, state)))
- die (NULL, "problem writing text [%s]\n", rp_valstr (retval));
- }
-
- if (state == NOTOK)
- die (file, "problem reading from");
-
- if (rp_isbad (retval = mm_wtend ()))
- die (NULL, "problem ending text [%s]\n", rp_valstr (retval));
-
- if (rp_isbad (retval = mm_rrply (&reply, &state)))
- die (NULL, "problem getting submission status [%s]\n",
- rp_valstr (retval));
-
- switch (rp_gval (reply.rp_val)) {
- case RP_OK:
- case RP_MOK:
- break;
-
- case RP_NO:
- die (NULL, "you lose; %s", reply.rp_line);
-
- case RP_NDEL:
- die (NULL, "no delivery occurred; %s", reply.rp_line);
-
- case RP_AGN:
- die (NULL, "try again later; %s", reply.rp_line);
-
- case RP_NOOP:
- die (NULL, "nothing done; %s", reply.rp_line);
-
- default:
- die (NULL, "unexpected response;\n\t[%s] -- %s",
- rp_valstr (reply.rp_val), reply.rp_line);
- }
-}
-
-#endif /* MMDFMTS */
-
/*
* SIGNAL HANDLING
@@ -1893,11 +1573,6 @@
if (msgflags & MINV)
unlink (bccfil);
-#ifdef MMDFMTS
- if (!whomsw || checksw)
- mm_end (NOTOK);
-#endif /* MMDFMTS */
-
#ifdef SMTPMTS
if (!whomsw || checksw)
sm_end (NOTOK);
@@ -2017,11 +1692,6 @@
if (msgflags & MINV)
unlink (bccfil);
-#ifdef MMDFMTS
- if (!whomsw || checksw)
- mm_end (NOTOK);
-#endif /* MMDFMTS */
-
#ifdef SMTPMTS
if (!whomsw || checksw)
sm_end (NOTOK);
@@ -2032,27 +1702,3 @@
va_end(ap);
done (1);
}
-
-
-#ifdef MMDFMTS
-/*
- * err_abrt() is used by the mm_ routines
- * do not, under *ANY* circumstances, remove it from post,
- * or you will lose *BIG*
- */
-
-void
-err_abrt (int code, char *fmt, ...)
-{
- char buffer[BUFSIZ];
- va_list ap;
-
- snprintf (buffer, sizeof(buffer), "[%s]", rp_valstr (code));
-
- va_start(ap, fmt);
- advertise (buffer, NULL, fmt, ap);
- va_end(ap);
-
- done (1);
-}
-#endif /* MMDFMTS */
Index: nmh/uip/slocal.c
diff -u nmh/uip/slocal.c:1.21 nmh/uip/slocal.c:1.22
--- nmh/uip/slocal.c:1.21 Fri Jan 6 21:51:44 2006
+++ nmh/uip/slocal.c Mon Jan 16 10:00:47 2006
@@ -2,7 +2,7 @@
/*
* slocal.c -- asynchronously filter and deliver new mail
*
- * $Id: slocal.c,v 1.21 2006/01/06 21:51:44 bress Exp $
+ * $Id: slocal.c,v 1.22 2006/01/16 10:00:47 opk Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -16,9 +16,6 @@
*
* to their $HOME/.forward file.
*
- * Under MMDF-I, users should (symbolically) link
- * /usr/local/nmh/lib/slocal to $HOME/bin/rcvmail.
- *
*/
/* Changed to use getutent() and friends. Assumes that when getutent() exists,
@@ -1191,10 +1188,6 @@
status = pidwait (child_id, 0);
alarm (0);
-#ifdef MMDFI
- if (status == RP_MOK || status == RP_OK)
- status = 0;
-#endif
if (verbose) {
if (status == 0)
verbose_printf (", success.\n");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] nmh ./ChangeLog h/aliasbr.h h/rcvmail.h man/Mak...,
Oliver Kiddle <=