From nmh-workers-bounces+ehood=mallorn.com@nongnu.org Mon Oct 1 09:27:03 2007 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on lorien2.mallorn.com X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=BAYES_00,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham version=3.1.7 X-mallorn-MailScanner-Watermark: 1191859854.37025@bjvHzf9BmS6EuUqnZePycg X-Envelope-From: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-Envelope-To: Return-Path: Received: from lorien2.mallorn.com [208.78.102.2] by remote.mallorn.com with POP3 (fetchmail-6.3.8) for (single-drop); Mon, 01 Oct 2007 09:27:03 -0700 (MST) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by lorien2.mallorn.com (8.14.1/8.14.1) with ESMTP id l91GAmXQ029104 for ; Mon, 1 Oct 2007 12:10:53 -0400 Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IcNr5-0004u7-Ac for ehood@mallorn.com; Mon, 01 Oct 2007 12:10:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IcNqw-0004ts-CP for nmh-workers@nongnu.org; Mon, 01 Oct 2007 12:10:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IcNqr-0004tQ-Nu for nmh-workers@nongnu.org; Mon, 01 Oct 2007 12:10:37 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IcNqr-0004tM-KL for nmh-workers@nongnu.org; Mon, 01 Oct 2007 12:10:33 -0400 Received: from dc.cis.okstate.edu ([139.78.100.219]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IcNqr-0004wQ-2G for nmh-workers@nongnu.org; Mon, 01 Oct 2007 12:10:33 -0400 Received: from dc.cis.okstate.edu (localhost.cis.okstate.edu [127.0.0.1]) by dc.cis.okstate.edu (8.13.8/8.13.8) with ESMTP id l91GAVfZ044012 for ; Mon, 1 Oct 2007 11:10:31 -0500 (CDT) (envelope-from martin@dc.cis.okstate.edu) Message-Id: <200710011610.l91GAVfZ044012@dc.cis.okstate.edu> To: nmh-workers@nongnu.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <44009.1191255031.1@dc.cis.okstate.edu> Date: Mon, 01 Oct 2007 11:10:31 -0500 From: Martin McCormick X-Detected-Kernel: FreeBSD 6.x (1) Subject: [Nmh-workers] What Happened to mha-mhedit? X-BeenThere: nmh-workers@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: nmh-workers.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nmh-workers-bounces+ehood=mallorn.com@nongnu.org Errors-To: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-mallorn-MailScanner-Information: Please contact the ISP for more information X-mallorn-MailScanner: Found to be clean I moved my mail base of operations from one system to another and installed the latest version of mhonarc, still using the configuration files I had used on the slightly older system. I started to reply to a mime message and got the error stating that /usr/local/bin/mha-mhedit was missing. It had been part of the source tree for the FreeBSD port of mhonarc but it seems to have vanished. Martin McCormick WB5AGZ Stillwater, OK Systems Engineer OSU Information Technology Department Network Operations Group _______________________________________________ Nmh-workers mailing list Nmh-workers@nongnu.org http://lists.nongnu.org/mailman/listinfo/nmh-workers From nmh-workers-bounces+ehood=mallorn.com@nongnu.org Fri Oct 5 13:27:02 2007 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on lorien2.mallorn.com X-Spam-Level: X-Spam-Status: No, score=-1.5 required=4.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.2.3 X-mallorn-MailScanner-Watermark: 1192220236.57021@V9Dg3aWmZudh2KGcmXg7Jg X-Envelope-From: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-Envelope-To: Return-Path: Received: from lorien2.mallorn.com [208.78.102.2] by remote.mallorn.com with POP3 (fetchmail-6.3.8) for (single-drop); Fri, 05 Oct 2007 13:27:02 -0700 (MST) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by lorien2.mallorn.com (8.14.1/8.14.1) with ESMTP id l95KH91B001567 for ; Fri, 5 Oct 2007 16:17:14 -0400 Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Idtbg-0007nF-Uw for ehood@mallorn.com; Fri, 05 Oct 2007 16:17:08 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IdtbP-0007dI-9b for nmh-workers@nongnu.org; Fri, 05 Oct 2007 16:16:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IdtbO-0007cA-JA for nmh-workers@nongnu.org; Fri, 05 Oct 2007 16:16:50 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdtbO-0007bn-CB for nmh-workers@nongnu.org; Fri, 05 Oct 2007 16:16:50 -0400 Received: from mta16.mail.adelphia.net ([68.168.78.211] helo=mta16.adelphia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IdtbO-0003bL-4M for nmh-workers@nongnu.org; Fri, 05 Oct 2007 16:16:50 -0400 Received: from gator.earlhood.com ([76.185.71.92]) by mta16.adelphia.net (InterMail vM.6.01.05.04 201-2131-123-105-20051025) with ESMTP id <20071005201643.OJE6229.mta16.adelphia.net@gator.earlhood.com> for ; Fri, 5 Oct 2007 16:16:43 -0400 Received: from gator.earlhood.com (ehood@localhost) by gator.earlhood.com (8.12.11.20060308/) with ESMTP id l95KK0Ii012759 for ; Fri, 5 Oct 2007 15:20:00 -0500 Message-Id: <200710052020.l95KK0Ii012759@gator.earlhood.com> To: nmh-workers@nongnu.org Subject: Re: [Nmh-workers] What Happened to mha-mhedit? From: Earl Hood In-reply-to: <200710011610.l91GAVfZ044012@dc.cis.okstate.edu> References: <200710011610.l91GAVfZ044012@dc.cis.okstate.edu> Date: Fri, 05 Oct 2007 15:20:00 -0500 X-Detected-Kernel: Solaris 8 (2) X-BeenThere: nmh-workers@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Earl Hood List-Id: nmh-workers.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nmh-workers-bounces+ehood=mallorn.com@nongnu.org Errors-To: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-mallorn-MailScanner-Information: Please contact the ISP for more information X-mallorn-MailScanner: Found to be clean On October 1, 2007 at 11:10, Martin McCormick wrote: > I moved my mail base of operations from one system to > another and installed the latest version of mhonarc, still using > the configuration files I had used on the slightly older system. > I started to reply to a mime message and got the error stating > that /usr/local/bin/mha-mhedit was missing. It had been part of > the source tree for the FreeBSD port of mhonarc but it seems to > have vanished. mha-mhedit is not part nmh, so this not the appropriate forum for your question. I noticed you sent a post to the mhonarc-users list, so I will respond there. --ewh _______________________________________________ Nmh-workers mailing list Nmh-workers@nongnu.org http://lists.nongnu.org/mailman/listinfo/nmh-workers From nmh-workers-bounces+ehood=mallorn.com@nongnu.org Tue Oct 16 20:27:03 2007 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on lorien2.mallorn.com X-Spam-Level: X-Spam-Status: No, score=0.8 required=4.0 tests=AWL,BAYES_50,SPF_PASS autolearn=no version=3.2.3 X-mallorn-MailScanner-Watermark: 1193194102.32476@9ZacZ2BmiPXksv+MFzi9AQ X-Envelope-From: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-Envelope-To: Return-Path: Received: from lorien2.mallorn.com [208.78.102.2] by remote.mallorn.com with POP3 (fetchmail-6.3.8) for (single-drop); Tue, 16 Oct 2007 20:27:03 -0700 (MST) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by lorien2.mallorn.com (8.14.1/8.14.1) with ESMTP id l9H2mGk5014472 for ; Tue, 16 Oct 2007 22:48:21 -0400 Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IhyxE-0003hi-4i for ehood@mallorn.com; Tue, 16 Oct 2007 22:48:16 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ihyx2-0003g2-Od for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:48:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ihyx1-0003fX-W6 for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:48:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ihyx1-0003fU-PX for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:48:03 -0400 Received: from turing-police.cc.vt.edu ([128.173.14.107]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ihyx1-0006t3-4E for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:48:03 -0400 Received: from turing-police.cc.vt.edu (turing-police.cc.vt.edu [127.0.0.1]) by turing-police.cc.vt.edu (8.14.2.Alpha0/8.14.2.Alpha0) with ESMTP id l9H2m1aH017382 for ; Tue, 16 Oct 2007 22:48:01 -0400 X-Mailer: exmh version 2.7.2 01/07/2005 with nmh-1.2 To: nmh-workers@nongnu.org From: Valdis.Kletnieks@vt.edu Mime-Version: 1.0 Date: Tue, 16 Oct 2007 22:48:01 -0400 Message-ID: <17380.1192589281@turing-police.cc.vt.edu> X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: [Nmh-workers] replcomps and MIME handling... X-BeenThere: nmh-workers@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: nmh-workers.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0867636535==" Sender: nmh-workers-bounces+ehood=mallorn.com@nongnu.org Errors-To: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-mallorn-MailScanner-Information: Please contact the ISP for more information X-mallorn-MailScanner: Found to be clean --===============0867636535== Content-Type: multipart/signed; boundary="==_Exmh_1192589281_3070P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit --==_Exmh_1192589281_3070P Content-Type: text/plain; charset=us-ascii Is this thing on? Dragging a thread over here from the exmh list, as Robert Elz pointed out that it's probably replcomp's job.. Has anybody looked at what it would take to do the following: 1) Fix replcomps and friends so base64 or quoted-printable was decoded before processing, so you don't get stuff like: > us1 =3D (const unsigned char *) s1, or even worse base64 stuff? 2) Do a better job of replying to a multipart, so you can cite just the primary text/plain, without sucking in MIME headers and base64 encoding of an attached .jpg, and all that stuff too? --==_Exmh_1192589281_3070P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Exmh version 2.5 07/13/2001 iD8DBQFHFXfhcC3lWbTT17ARAkbQAKC+9261lypYm4SVVHgiBVu+A1cKVQCeK/7g rRWjrMHsOIGpb9kE3OfZqok= =hrYG -----END PGP SIGNATURE----- --==_Exmh_1192589281_3070P-- --===============0867636535== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Nmh-workers mailing list Nmh-workers@nongnu.org http://lists.nongnu.org/mailman/listinfo/nmh-workers --===============0867636535==-- From nmh-workers-bounces+ehood=mallorn.com@nongnu.org Tue Oct 16 20:27:03 2007 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on lorien2.mallorn.com X-Spam-Level: X-Spam-Status: No, score=0.3 required=4.0 tests=AWL,BAYES_50,SPF_PASS autolearn=no version=3.2.3 X-mallorn-MailScanner-Watermark: 1193194464.20875@77waLN8H9JPgCqqnu/qKhg X-Envelope-From: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-Envelope-To: Return-Path: Received: from lorien2.mallorn.com [208.78.102.2] by remote.mallorn.com with POP3 (fetchmail-6.3.8) for (single-drop); Tue, 16 Oct 2007 20:27:03 -0700 (MST) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by lorien2.mallorn.com (8.14.1/8.14.1) with ESMTP id l9H2sEZf014907 for ; Tue, 16 Oct 2007 22:54:19 -0400 Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ihz30-00079I-BF for ehood@mallorn.com; Tue, 16 Oct 2007 22:54:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ihz2q-00078p-KW for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:54:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ihz2p-00078a-4X for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:54:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ihz2o-00078U-Uj for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:54:02 -0400 Received: from cpe-61-9-138-184.static.vic.bigpond.net.au ([61.9.138.184] helo=panacea.null.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ihz2n-0007tm-LB for nmh-workers@nongnu.org; Tue, 16 Oct 2007 22:54:02 -0400 Received: from succubus.panacea.null.org (succubus.panacea.null.org [10.0.0.5]) by panacea.null.org (8.13.5.20060614/8.13.3) with ESMTP id l9H2rbpe010396 for ; Wed, 17 Oct 2007 12:53:37 +1000 (EST) Received: from succubus.panacea.null.org (localhost [127.0.0.1]) by succubus.panacea.null.org (8.13.5.20060614/8.13.3) with ESMTP id l9H2raFR002885 for ; Wed, 17 Oct 2007 12:53:36 +1000 (EST) To: nmh-workers@nongnu.org Subject: Re: [Nmh-workers] replcomps and MIME handling... In-reply-to: <17380.1192589281@turing-police.cc.vt.edu> References: <17380.1192589281@turing-police.cc.vt.edu> Comments: In-reply-to Valdis.Kletnieks@vt.edu message dated "Tue, 16 Oct 2007 22:48:01 -0400." Date: Wed, 17 Oct 2007 12:53:36 +1000 Message-ID: <3749.1192589616@succubus.panacea.null.org> From: Joel Reicher X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (panacea.null.org [10.0.0.1]); Wed, 17 Oct 2007 12:53:37 +1000 (EST) X-detected-kernel: by monty-python.gnu.org: NetBSD 3.0 (DF) X-BeenThere: nmh-workers@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: nmh-workers.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nmh-workers-bounces+ehood=mallorn.com@nongnu.org Errors-To: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-mallorn-MailScanner-Information: Please contact the ISP for more information X-mallorn-MailScanner: Found to be clean > Dragging a thread over here from the exmh list, as Robert Elz pointed out > that it's probably replcomp's job.. > > Has anybody looked at what it would take to do the following: > > 1) Fix replcomps and friends so base64 or quoted-printable was decoded > before processing, so you don't get stuff like: > > > us1 =3D (const unsigned char *) s1, > > or even worse base64 stuff? I want to look at this as soon as I work through the backlog of stuff that's kept me quiet recently. In case it helps, my workaround for the issue at the moment is to do repl -noformat and then, once the editor (vi in my case) is up, go to the last line and do something like :r! mhshow -part 2 -form mhl.null -nopause|fold -s -w78|sed 's/^/> /' It isn't pretty, but I consider it less irritating than the problem it addresses. > 2) Do a better job of replying to a multipart, so you can cite just the > primary text/plain, without sucking in MIME headers and base64 encoding of > an attached .jpg, and all that stuff too? All of this is really up to mhl. I think the real problem, when you get down to it, is that nmh's MIME capabilities have been kept separate. What's really required, in my opinion, is to make mhl's formatting language MIME-aware. Cheers, - Joel _______________________________________________ Nmh-workers mailing list Nmh-workers@nongnu.org http://lists.nongnu.org/mailman/listinfo/nmh-workers From nmh-workers-bounces+ehood=mallorn.com@nongnu.org Mon Oct 29 22:27:02 2007 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on lorien2.mallorn.com X-Spam-Level: X-Spam-Status: No, score=0.3 required=4.0 tests=AWL,BAYES_50,SPF_PASS autolearn=no version=3.2.3 X-mallorn-MailScanner-Watermark: 1194326445.50681@MebK3AiEzARu5rLO00V8RA X-Envelope-From: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-Envelope-To: Return-Path: Received: from lorien2.mallorn.com [208.78.102.2] by remote.mallorn.com with POP3 (fetchmail-6.3.8) for (single-drop); Mon, 29 Oct 2007 22:27:02 -0700 (MST) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by lorien2.mallorn.com (8.14.1/8.14.1) with ESMTP id l9U5KbU2027833 for ; Tue, 30 Oct 2007 01:20:43 -0400 Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ImjWn-0003jo-IQ for ehood@mallorn.com; Tue, 30 Oct 2007 01:20:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ImjWb-0003j8-T1 for nmh-workers@nongnu.org; Tue, 30 Oct 2007 01:20:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ImjWa-0003in-0h for nmh-workers@nongnu.org; Tue, 30 Oct 2007 01:20:24 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ImjWZ-0003iV-RI for nmh-workers@nongnu.org; Tue, 30 Oct 2007 01:20:23 -0400 Received: from cpe-61-9-138-184.static.vic.bigpond.net.au ([61.9.138.184] helo=panacea.null.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1ImjWY-0005HF-Bt for nmh-workers@nongnu.org; Tue, 30 Oct 2007 01:20:23 -0400 Received: from succubus.panacea.null.org (succubus.panacea.null.org [10.0.0.5]) by panacea.null.org (8.13.5.20060614/8.13.3) with ESMTP id l9U5Jv5Z002846 for ; Tue, 30 Oct 2007 16:19:57 +1100 (EST) Received: from succubus.panacea.null.org (localhost [127.0.0.1]) by succubus.panacea.null.org (8.13.5.20060614/8.13.3) with ESMTP id l9U5JuvD010311 for ; Tue, 30 Oct 2007 16:19:56 +1100 (EST) To: nmh-workers@nongnu.org Date: Tue, 30 Oct 2007 16:19:55 +1100 Message-ID: <13492.1193721595@succubus.panacea.null.org> From: Joel Reicher X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (panacea.null.org [10.0.0.1]); Tue, 30 Oct 2007 16:19:57 +1100 (EST) X-detected-kernel: by monty-python.gnu.org: NetBSD 3.0 (DF) Subject: [Nmh-workers] Decoupling done() X-BeenThere: nmh-workers@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: nmh-workers.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nmh-workers-bounces+ehood=mallorn.com@nongnu.org Errors-To: nmh-workers-bounces+ehood=mallorn.com@nongnu.org X-mallorn-MailScanner-Information: Please contact the ISP for more information X-mallorn-MailScanner: Found to be clean Some of you may remember a while ago I wrote about replacing done() with atexit() registration. Well, after wasting a lot of time figuring out a good way to do this I've decided to go with something else, at least to begin with. The general nature of the problem is as follows. There is a convention in a lot (not all!) of the nmh code to call done() to exit, and there is a done() defined in libmh.a which does nothing other than exit(). Some of the nmh executables, however, define their own version of done() which overrides the one in libmh.a when linking. Since done() is called by functions in libmh.a this is effectively a hack to do a callback. Ultimately these callbacks should probably be replaced by a more sensible mechanism wherever possible, but each "local" done() has its own problems to be solved, and I think it's too big and complex a change to do all at once. So, as a first step, what I've decided to do is get rid of this link hack. The patch which follows this email, and which I'd like some comments on, replaces done(), the function prototype, with a function pointer called "done", so that all the calls continue to work as is. The libmh.a version of done is renamed to default_done, and the function pointer is initialised to point to this function. Wherever there's a local done() it is renamed in what I think is a sensible way and in most cases the main() for that executable reassigns the done function pointer to point to this renamed local done(). A notable exception is sendsbr.c where I have made a chance which I think is more faithful to the use of the callback there. Comments are very welcome. Even better would be some patching and testing. I'm going to give this a few days (I'm running it on my own system already) and then I'll commit it to the repository. Cheers, - Joel Index: h/mh.h =================================================================== RCS file: /sources/nmh/nmh/h/mh.h,v retrieving revision 1.6 diff -u -r1.6 mh.h --- h/mh.h 21 Feb 2006 03:58:31 -0000 1.6 +++ h/mh.h 30 Oct 2007 04:54:57 -0000 @@ -336,5 +336,7 @@ extern char *whatnowproc; extern char *whomproc; +extern int (*done) (int); + #include Index: h/prototypes.h =================================================================== RCS file: /sources/nmh/nmh/h/prototypes.h,v retrieving revision 1.18 diff -u -r1.18 prototypes.h --- h/prototypes.h 13 Apr 2007 11:53:08 -0000 1.18 +++ h/prototypes.h 30 Oct 2007 04:54:57 -0000 @@ -47,7 +47,7 @@ void cpydgst (int, int, char *, char *); int decode_rfc2047 (char *, char *, size_t); void discard (FILE *); -int done (int); +int default_done (int); int ext_hook(char *, char *, char *); int fdcompare (int, int); int folder_addmsg (struct msgs **, char *, int, int, int, int, char *); Index: sbr/done.c =================================================================== RCS file: /sources/nmh/nmh/sbr/done.c,v retrieving revision 1.3 diff -u -r1.3 done.c --- sbr/done.c 2 Jul 2002 22:09:14 -0000 1.3 +++ sbr/done.c 30 Oct 2007 04:54:57 -0000 @@ -11,8 +11,10 @@ #include +int (*done) (int) = default_done; + int -done (int status) +default_done (int status) { exit (status); return 1; /* dead code to satisfy the compiler */ Index: uip/inc.c =================================================================== RCS file: /sources/nmh/nmh/uip/inc.c,v retrieving revision 1.24 diff -u -r1.24 inc.c --- uip/inc.c 21 Aug 2007 21:19:39 -0000 1.24 +++ uip/inc.c 30 Oct 2007 04:54:59 -0000 @@ -223,8 +223,8 @@ */ char *map_name(char *); +static int inc_done(int); #ifdef POP -int done(int); static int pop_action(char *); static int pop_pack(char *); static int map_count(void); @@ -263,6 +263,8 @@ struct hes_postoffice *po; #endif + done=inc_done; + /* absolutely the first thing we do is save our privileges, * and drop them if we can. */ @@ -987,8 +989,8 @@ #endif /* if 0 */ -int -done (int status) +static int +inc_done (int status) { #ifdef POP if (packfile && pd != NOTOK) Index: uip/mhbuild.c =================================================================== RCS file: /sources/nmh/nmh/uip/mhbuild.c,v retrieving revision 1.10 diff -u -r1.10 mhbuild.c --- uip/mhbuild.c 31 Jan 2006 02:50:57 -0000 1.10 +++ uip/mhbuild.c 30 Oct 2007 04:54:59 -0000 @@ -100,6 +100,7 @@ static char outfile[BUFSIZ]; static int unlink_outfile = 0; +static int unlink_done (int); /* mhbuildsbr.c */ CT build_mime (char *); @@ -126,6 +127,8 @@ CT ct, cts[2]; FILE *fp; + done=unlink_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -382,8 +385,8 @@ } -int -done (int status) +static int +unlink_done (int status) { /* * Check if we need to remove stray Index: uip/mhlist.c =================================================================== RCS file: /sources/nmh/nmh/uip/mhlist.c,v retrieving revision 1.12 diff -u -r1.12 mhlist.c --- uip/mhlist.c 27 Apr 2006 12:00:28 -0000 1.12 +++ uip/mhlist.c 30 Oct 2007 04:54:59 -0000 @@ -117,6 +117,7 @@ * static prototypes */ static RETSIGTYPE pipeser (int); +static int freectp_done (int); int @@ -131,6 +132,8 @@ struct msgs *mp = NULL; CT ct, *ctp; + done=freectp_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -391,8 +394,8 @@ } -int -done (int status) +static int +freectp_done (int status) { CT *ctp; Index: uip/mhn.c =================================================================== RCS file: /sources/nmh/nmh/uip/mhn.c,v retrieving revision 1.12 diff -u -r1.12 mhn.c --- uip/mhn.c 27 Apr 2006 12:00:28 -0000 1.12 +++ uip/mhn.c 30 Oct 2007 04:55:00 -0000 @@ -205,6 +205,7 @@ * static prototypes */ static RETSIGTYPE pipeser (int); +static int freectp_done (int); int @@ -220,6 +221,8 @@ CT ct, *ctp; FILE *fp; + done=freectp_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -704,8 +707,8 @@ } -int -done (int status) +static int +freectp_done (int status) { CT *ctp; Index: uip/mhshow.c =================================================================== RCS file: /sources/nmh/nmh/uip/mhshow.c,v retrieving revision 1.12 diff -u -r1.12 mhshow.c --- uip/mhshow.c 27 Apr 2006 12:00:28 -0000 1.12 +++ uip/mhshow.c 30 Oct 2007 04:55:00 -0000 @@ -133,6 +133,7 @@ * static prototypes */ static RETSIGTYPE pipeser (int); +static int freectp_done (int); int @@ -147,6 +148,8 @@ CT ct, *ctp; FILE *fp; + done=freectp_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -471,8 +474,8 @@ } -int -done (int status) +static int +freectp_done (int status) { CT *ctp; Index: uip/mhstore.c =================================================================== RCS file: /sources/nmh/nmh/uip/mhstore.c,v retrieving revision 1.12 diff -u -r1.12 mhstore.c --- uip/mhstore.c 27 Apr 2006 12:00:28 -0000 1.12 +++ uip/mhstore.c 30 Oct 2007 04:55:00 -0000 @@ -111,6 +111,7 @@ * static prototypes */ static RETSIGTYPE pipeser (int); +static int freectp_done (int); int @@ -125,6 +126,8 @@ CT ct, *ctp; FILE *fp; + done=freectp_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -403,8 +406,8 @@ } -int -done (int status) +static int +freectp_done (int status) { CT *ctp; Index: uip/mhtest.c =================================================================== RCS file: /sources/nmh/nmh/uip/mhtest.c,v retrieving revision 1.12 diff -u -r1.12 mhtest.c --- uip/mhtest.c 27 Apr 2006 12:00:28 -0000 1.12 +++ uip/mhtest.c 30 Oct 2007 04:55:01 -0000 @@ -114,6 +114,7 @@ */ static int write_content (CT *, char *); static RETSIGTYPE pipeser (int); +static int freectp_done (int); int @@ -127,6 +128,8 @@ struct msgs *mp = NULL; CT ct, *ctp; + done=freectp_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -397,8 +400,8 @@ } -int -done (int status) +static int +freectp_done (int status) { CT *ctp; Index: uip/packf.c =================================================================== RCS file: /sources/nmh/nmh/uip/packf.c,v retrieving revision 1.9 diff -u -r1.9 packf.c --- uip/packf.c 27 Apr 2006 12:00:28 -0000 1.9 +++ uip/packf.c 30 Oct 2007 04:55:01 -0000 @@ -33,6 +33,8 @@ static int mbx_style = MBOX_FORMAT; static int mapping = 0; +static int mbxclose_done(int); + char *file = NULL; @@ -46,6 +48,8 @@ struct msgs *mp; struct stat st; + done=mbxclose_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -178,8 +182,8 @@ return done (0); } -int -done (int status) +static int +mbxclose_done (int status) { mbx_close (file, md); exit (status); Index: uip/pick.c =================================================================== RCS file: /sources/nmh/nmh/uip/pick.c,v retrieving revision 1.10 diff -u -r1.10 pick.c --- uip/pick.c 27 Apr 2006 12:00:28 -0000 1.10 +++ uip/pick.c 30 Oct 2007 04:55:01 -0000 @@ -68,6 +68,7 @@ static int listsw = -1; +static int putzero_done (int); int main (int argc, char **argv) @@ -81,6 +82,8 @@ struct msgs *mp; register FILE *fp; + done=putzero_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -287,8 +290,8 @@ } -int -done (int status) +static int +putzero_done (int status) { if (listsw && status && !isatty (fileno (stdout))) printf ("0\n"); Index: uip/rcvdist.c =================================================================== RCS file: /sources/nmh/nmh/uip/rcvdist.c,v retrieving revision 1.10 diff -u -r1.10 rcvdist.c --- uip/rcvdist.c 8 Mar 2006 12:14:16 -0000 1.10 +++ uip/rcvdist.c 30 Oct 2007 04:55:02 -0000 @@ -34,7 +34,7 @@ * prototypes */ static void rcvdistout (FILE *, char *, char *); -int done (int); +static int unlink_done (int); int @@ -46,6 +46,8 @@ char **argp, **arguments, *vec[MAXARGS]; register FILE *fp; + done=unlink_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -268,8 +270,8 @@ } -int -done (int status) +static int +unlink_done (int status) { if (backup[0]) unlink (backup); Index: uip/rcvstore.c =================================================================== RCS file: /sources/nmh/nmh/uip/rcvstore.c,v retrieving revision 1.11 diff -u -r1.11 rcvstore.c --- uip/rcvstore.c 27 Apr 2006 12:00:28 -0000 1.11 +++ uip/rcvstore.c 30 Oct 2007 04:55:02 -0000 @@ -48,6 +48,7 @@ */ static char *tmpfilenam = NULL; +static int unlink_done(int); int main (int argc, char **argv) @@ -60,6 +61,8 @@ struct msgs *mp; struct stat st; + done=unlink_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -228,8 +231,8 @@ /* * Clean up and exit */ -int -done(int status) +static int +unlink_done(int status) { if (tmpfilenam && *tmpfilenam) unlink (tmpfilenam); Index: uip/sendsbr.c =================================================================== RCS file: /sources/nmh/nmh/uip/sendsbr.c,v retrieving revision 1.15 diff -u -r1.15 sendsbr.c --- uip/sendsbr.c 21 Mar 2007 00:21:10 -0000 1.15 +++ uip/sendsbr.c 30 Oct 2007 04:55:03 -0000 @@ -41,7 +41,6 @@ char *annotext = NULL; char *distfile = NULL; -static int armed = 0; static jmp_buf env; static char body_file_name[MAXPATHLEN + 1]; /* name of temporary file for body content */ @@ -56,12 +55,12 @@ * external prototypes */ int sendsbr (char **, int, char *, struct stat *, int, char *, int); -int done (int); char *getusername (void); /* * static prototypes */ +static int armed_done (int); static void alert (char *, int); static int tmp_fd (void); static void anno (int, struct stat *); @@ -118,7 +117,7 @@ } } - armed++; + done=armed_done; switch (setjmp (env)) { case OK: /* @@ -154,7 +153,7 @@ break; } - armed = 0; + done=default_done; if (distfile) unlink (distfile); @@ -1075,11 +1074,10 @@ } -int -done (int status) +static int +armed_done (int status) { - if (armed) - longjmp (env, status ? status : NOTOK); + longjmp (env, status ? status : NOTOK); exit (status); return 1; /* dead code to satisfy the compiler */ _______________________________________________ Nmh-workers mailing list Nmh-workers@nongnu.org http://lists.nongnu.org/mailman/listinfo/nmh-workers