From: Peter Maydell <pmaydell@chiark.greenend.org.uk>
Date: Wed, 21 Mar 2007 00:21:10 +0000 (+0000)
Subject: bug #18630, #18631, #18632, #18634: various patches from Craig Leres
X-Git-Tag: nmh-1_3_RC1~24
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=30fd2ad6d3eff3749b2ae99ec90d2215bf1b1aca;p=mmh

bug #18630, #18631, #18632, #18634: various patches from Craig Leres
fixing error message argument problems.
---

diff --git a/ChangeLog b/ChangeLog
index d630a7c..89de2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-12  Peter Maydell <pmaydell@chiark.greenend.org.uk>
 
+	* bug #18630, #18631, #18632, #18634: various patches from
+	Craig Leres fixing error message argument problems.
+
+2007-03-12  Peter Maydell <pmaydell@chiark.greenend.org.uk>
+
 	* bug #15212: configure.in, acconfig.h: remove configure test for
 	broken AT&T vi. This test was broken (it was always returning
 	failure even for non-broken vi implementations) and
diff --git a/sbr/context_read.c b/sbr/context_read.c
index 32051c5..1a584e4 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -113,7 +113,7 @@ context_read (void)
 	free (cp);
 
 	if (!makedir (nd))
-	    adios (NULL, "unable to create", nd);
+	    adios (NULL, "unable to create %s", nd);
     }
 
     else if ((st.st_mode & S_IFDIR) == 0)
diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 1af116c..f90cedf 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -180,11 +180,11 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 	     */
 	    if (linkerr == EXDEV) {
 		if (stat (newmsg, &st1) == 0) {
-		    advise (NULL, "message %s:%s already exists", newmsg);
+		    advise (NULL, "message %s:%s already exists", mp->foldpath, newmsg);
 		    return -1;
 		} else {
 		    if ((infd = open (msgfile, O_RDONLY)) == -1) {
-			advise (msgfile, "unable to open message %s");
+			advise (msgfile, "unable to open message %s", msgfile);
 			return -1;
 		    }
 		    fstat (infd, &st1);
diff --git a/uip/forw.c b/uip/forw.c
index 7645e38..17e78e9 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -508,7 +508,7 @@ mhl_draft (int out, char *digest, int volume, int issue,
 
 	    if (mp->numsel >= MAXARGS - i)
 		adios (NULL, "more than %d messages for %s exec",
-			vec[0], MAXARGS - i);
+			MAXARGS - i, vec[0]);
 
 	    /*
 	     * Now add the message names to filter.  We can only
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 2d9a7d4..aeba011 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -1010,7 +1010,7 @@ annoaux (int fd)
     }
     if (!(mp = folder_read (folder))) {
 	if (debugsw)
-	    admonish (NULL, "unable to read folder %s");
+	    admonish (NULL, "unable to read folder %s", folder);
 	return;
     }