bug #18630, #18631, #18632, #18634: various patches from Craig Leres

fixing error message argument problems.

diff --git a/ChangeLog b/ChangeLog
index d630a7c6782c5983ad8dca8e176f9f76bd5d4977..89de2f8d3e7ffa44192e81f9bb0c20ae93cd071f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 32051c525134f331537485f130f371b1bf58a97a..1a584e4cb98e68e3ac46f61e2e3fc62fc349da2b 100644 (file)
--- 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 1af116cb71fe580316ceb4543d060998c3ba0cfa..f90cedfbae04504f4817e228a528a383dd7e0b6e 100644 (file)
--- 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 7645e3821f06485009226d2412ad8bceaee48612..17e78e981782ae09a824ae3e6e6387fa3c6ad24f 100644 (file)
--- 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 2d9a7d42737d610fe28d449effde9e7fe71b933a..aeba011e1377352e48db87e90cd7ea3d862b7ba0 100644 (file)
--- 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;
     }