[Nmh-commits] nmh ChangeLog sbr/context_read.c sbr/folder_add...

[Peter Maydell]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     Peter Maydell <pm215>   07/03/21 00:21:10

Modified files:
        .              : ChangeLog 
        sbr            : context_read.c folder_addmsg.c 
        uip            : forw.c sendsbr.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/context_read.c?cvsroot=nmh&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/folder_addmsg.c?cvsroot=nmh&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/forw.c?cvsroot=nmh&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/sendsbr.c?cvsroot=nmh&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- ChangeLog   21 Mar 2007 00:18:19 -0000      1.247
+++ ChangeLog   21 Mar 2007 00:21:10 -0000      1.248
@@ -1,5 +1,10 @@
 2007-03-12  Peter Maydell <address@hidden>
 
+       * bug #18630, #18631, #18632, #18634: various patches from
+       Craig Leres fixing error message argument problems.
+
+2007-03-12  Peter Maydell <address@hidden>
+
        * 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

Index: sbr/context_read.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/context_read.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- sbr/context_read.c  14 Dec 2005 01:48:24 -0000      1.9
+++ sbr/context_read.c  21 Mar 2007 00:21:10 -0000      1.10
@@ -1,7 +1,7 @@
 /*
  * context_read.c -- find and read profile and context files
  *
- * $Id: context_read.c,v 1.9 2005/12/14 01:48:24 bress Exp $
+ * $Id: context_read.c,v 1.10 2007/03/21 00:21:10 pm215 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
@@ -113,7 +113,7 @@
        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)

Index: sbr/folder_addmsg.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/folder_addmsg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- sbr/folder_addmsg.c 19 Nov 2004 05:06:16 -0000      1.7
+++ sbr/folder_addmsg.c 21 Mar 2007 00:21:10 -0000      1.8
@@ -2,7 +2,7 @@
 /*
  * folder_addmsg.c -- Link message into folder
  *
- * $Id: folder_addmsg.c,v 1.7 2004/11/19 05:06:16 jon Exp $
+ * $Id: folder_addmsg.c,v 1.8 2007/03/21 00:21:10 pm215 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
@@ -180,11 +180,11 @@
             */
            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);

Index: uip/forw.c
===================================================================
RCS file: /sources/nmh/nmh/uip/forw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- uip/forw.c  27 Apr 2006 12:00:28 -0000      1.9
+++ uip/forw.c  21 Mar 2007 00:21:10 -0000      1.10
@@ -2,7 +2,7 @@
 /*
  * forw.c -- forward a message, or group of messages.
  *
- * $Id: forw.c,v 1.9 2006/04/27 12:00:28 jjr Exp $
+ * $Id: forw.c,v 1.10 2007/03/21 00:21:10 pm215 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
@@ -508,7 +508,7 @@
 
            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

Index: uip/sendsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/sendsbr.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/sendsbr.c       24 Oct 2006 14:31:40 -0000      1.14
+++ uip/sendsbr.c       21 Mar 2007 00:21:10 -0000      1.15
@@ -2,7 +2,7 @@
 /*
  * sendsbr.c -- routines to help WhatNow/Send along
  *
- * $Id: sendsbr.c,v 1.14 2006/10/24 14:31:40 levine Exp $
+ * $Id: sendsbr.c,v 1.15 2007/03/21 00:21:10 pm215 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
@@ -1010,7 +1010,7 @@
     }
     if (!(mp = folder_read (folder))) {
        if (debugsw)
-           admonish (NULL, "unable to read folder %s");
+           admonish (NULL, "unable to read folder %s", folder);
        return;
     }