[Nmh-commits] nmh ChangeLog sbr/fmt_scan.c sbr/lock_file.c sb...

[Peter Maydell]

CVSROOT:        /cvsroot/nmh
Module name:    nmh
Changes by:     Peter Maydell <pm215>   08/04/05 18:41:38

Modified files:
        .              : ChangeLog 
        sbr            : fmt_scan.c lock_file.c m_backup.c m_getfld.c 
                         m_scratch.c mf.c path.c 
        uip            : annosbr.c dropsbr.c mhbuildsbr.c mhparse.c 
                         slocal.c 

Log message:
        Bug #20028 (Debian bug 399271): fix code assuming that pointer
        differences were 32 bits -- thanks to Dean Gaudet for the patch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.251&r2=1.252
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/fmt_scan.c?cvsroot=nmh&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/lock_file.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/m_backup.c?cvsroot=nmh&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/m_getfld.c?cvsroot=nmh&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/m_scratch.c?cvsroot=nmh&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/mf.c?cvsroot=nmh&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/path.c?cvsroot=nmh&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/annosbr.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/dropsbr.c?cvsroot=nmh&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhbuildsbr.c?cvsroot=nmh&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhparse.c?cvsroot=nmh&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/slocal.c?cvsroot=nmh&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/nmh/nmh/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -b -r1.251 -r1.252
--- ChangeLog   25 Jan 2008 21:00:42 -0000      1.251
+++ ChangeLog   5 Apr 2008 18:41:37 -0000       1.252
@@ -1,3 +1,8 @@
+2008-04-05  Peter Maydell <address@hidden>
+
+       * bug #20028 (Debian bug 399271): fix code assuming that pointer
+       differences were 32 bits -- thanks to Dean Gaudet for the patch.
+
 2008-01-25  Josh Bressers <address@hidden>
 
        * uip/mhshowsbr.c (show_all_messages): Be more generous when parsing

Index: sbr/fmt_scan.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/fmt_scan.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- sbr/fmt_scan.c      13 Apr 2007 11:53:08 -0000      1.24
+++ sbr/fmt_scan.c      5 Apr 2008 18:41:37 -0000       1.25
@@ -2,7 +2,7 @@
 /*
  * fmt_scan.c -- format string interpretation
  *
- * $Id: fmt_scan.c,v 1.24 2007/04/13 11:53:08 jjr Exp $
+ * $Id: fmt_scan.c,v 1.25 2008/04/05 18:41:37 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
@@ -288,7 +288,7 @@
            || !(cp = strchr(mbox += idx + strlen (key), '/')))
        return 0;
 
-    snprintf (buffer, buffer_len, "%*.*s", cp - mbox, cp - mbox, mbox);
+    snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), 
mbox);
     return 1;
 }
 

Index: sbr/lock_file.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/lock_file.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- sbr/lock_file.c     29 Apr 2007 20:49:32 -0000      1.14
+++ sbr/lock_file.c     5 Apr 2008 18:41:37 -0000       1.15
@@ -2,7 +2,7 @@
 /*
  * lock.c -- routines to lock/unlock files
  *
- * $Id: lock_file.c,v 1.14 2007/04/29 20:49:32 pm215 Exp $
+ * $Id: lock_file.c,v 1.15 2008/04/05 18:41:37 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
@@ -494,7 +494,7 @@
     bplen += tmplen;
 #else
     if (cp != file) {
-       snprintf (bp, sizeof(li->curlock), "%.*s", cp - file, file);
+       snprintf (bp, sizeof(li->curlock), "%.*s", (int)(cp - file), file);
        tmplen = strlen (bp);
        bp    += tmplen;
        bplen += tmplen;
@@ -526,7 +526,7 @@
            strncpy (li->tmplock, ",LCK.XXXXXX", sizeof(li->tmplock));
        else
            snprintf (li->tmplock, sizeof(li->tmplock), "%.*s,LCK.XXXXXX",
-                    cp - li->curlock, li->curlock);
+                    (int)(cp - li->curlock), li->curlock);
     }
 #endif
 }

Index: sbr/m_backup.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/m_backup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- sbr/m_backup.c      2 Jul 2002 22:09:14 -0000       1.2
+++ sbr/m_backup.c      5 Apr 2008 18:41:37 -0000       1.3
@@ -2,7 +2,7 @@
 /*
  * m_backup.c -- construct a backup file
  *
- * $Id: m_backup.c,v 1.2 2002/07/02 22:09:14 kenh Exp $
+ * $Id: m_backup.c,v 1.3 2008/04/05 18:41:37 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
@@ -22,7 +22,7 @@
        snprintf(buffer, sizeof(buffer), "%s%s",
                BACKUP_PREFIX, cp);
     else
-       snprintf(buffer, sizeof(buffer), "%.*s%s%s", cp - file, file,
+       snprintf(buffer, sizeof(buffer), "%.*s%s%s", (int)(cp - file), file,
                BACKUP_PREFIX, cp);
 
     unlink(buffer);

Index: sbr/m_getfld.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/m_getfld.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- sbr/m_getfld.c      8 Nov 2007 02:28:39 -0000       1.12
+++ sbr/m_getfld.c      5 Apr 2008 18:41:37 -0000       1.13
@@ -2,7 +2,7 @@
 /*
  * m_getfld.c -- read/parse a message
  *
- * $Id: m_getfld.c,v 1.12 2007/11/08 02:28:39 jjr Exp $
+ * $Id: m_getfld.c,v 1.13 2008/04/05 18:41:37 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
@@ -700,10 +700,10 @@
     if (cp) {
        /* return path for UUCP style addressing */
        dp = strchr (++cp, '\n');
-       snprintf (rp, rplen, "%.*s!%.*s\n", dp - cp, cp, bp - ap, ap);
+       snprintf (rp, rplen, "%.*s!%.*s\n", (int)(dp - cp), cp, (int)(bp - ap), 
ap);
     } else {
        /* return path for standard domain addressing */
-       snprintf (rp, rplen, "%.*s\n", bp - ap, ap);
+       snprintf (rp, rplen, "%.*s\n", (int)(bp - ap), ap);
     }
 
     /*

Index: sbr/m_scratch.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/m_scratch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- sbr/m_scratch.c     2 Jul 2002 22:09:14 -0000       1.5
+++ sbr/m_scratch.c     5 Apr 2008 18:41:37 -0000       1.6
@@ -2,7 +2,7 @@
 /*
  * m_scratch.c -- construct a scratch file
  *
- * $Id: m_scratch.c,v 1.5 2002/07/02 22:09:14 kenh Exp $
+ * $Id: m_scratch.c,v 1.6 2008/04/05 18:41:37 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
@@ -33,7 +33,7 @@
     if ((cp = r1bindex (file, '/')) == file)
        strncpy (buffer, tmpfil, sizeof(buffer));
     else
-       snprintf (buffer, sizeof(buffer), "%.*s%s", cp - file, file, tmpfil);
+       snprintf (buffer, sizeof(buffer), "%.*s%s", (int)(cp - file), file, 
tmpfil);
     unlink (buffer);
 
     return buffer;

Index: sbr/mf.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/mf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- sbr/mf.c    13 Apr 2007 11:53:08 -0000      1.7
+++ sbr/mf.c    5 Apr 2008 18:41:38 -0000       1.8
@@ -2,7 +2,7 @@
 /*
  * mf.c -- mail filter subroutines
  *
- * $Id: mf.c,v 1.7 2007/04/13 11:53:08 jjr Exp $
+ * $Id: mf.c,v 1.8 2008/04/05 18:41:38 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
@@ -421,7 +421,7 @@
     while (isspace (*ap))
        ap++;
     if (cp)
-       sprintf (adr, "%.*s", cp - ap, ap);
+       sprintf (adr, "%.*s", (int)(cp - ap), ap);
     else
        strcpy (adr, ap);
     bp = adr + strlen (adr) - 1;

Index: sbr/path.c
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/path.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- sbr/path.c  27 Apr 2006 12:00:28 -0000      1.3
+++ sbr/path.c  5 Apr 2008 18:41:38 -0000       1.4
@@ -2,7 +2,7 @@
 /*
  * path.c -- return a pathname
  *
- * $Id: path.c,v 1.3 2006/04/27 12:00:28 jjr Exp $
+ * $Id: path.c,v 1.4 2008/04/05 18:41:38 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
@@ -90,7 +90,7 @@
        name += NCWD;
 
     if (strcmp (name, DOTDOT) == 0 || strcmp (name, PWD) == 0) {
-       snprintf (buffer, sizeof(buffer), "%.*s", cp - pwds, pwds);
+       snprintf (buffer, sizeof(buffer), "%.*s", (int)(cp - pwds), pwds);
        return getcpy (buffer);
     }
 
@@ -99,7 +99,7 @@
     else
        cp = ep;
 
-    snprintf (buffer, sizeof(buffer), "%.*s/%s", cp - pwds, pwds, name);
+    snprintf (buffer, sizeof(buffer), "%.*s/%s", (int)(cp - pwds), pwds, name);
     return getcpy (buffer);
 }
 

Index: uip/annosbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/annosbr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/annosbr.c       2 Jan 2006 03:25:18 -0000       1.8
+++ uip/annosbr.c       5 Apr 2008 18:41:38 -0000       1.9
@@ -2,7 +2,7 @@
 /*
  * annosbr.c -- prepend annotation to messages
  *
- * $Id: annosbr.c,v 1.8 2006/01/02 03:25:18 bress Exp $
+ * $Id: annosbr.c,v 1.9 2008/04/05 18:41:38 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
@@ -381,7 +381,7 @@
                while (*cp && *cp++ != '\n')
                    continue;
                if (cp - sp)
-                   fprintf (tmp, "%s: %*.*s", comp, cp - sp, cp - sp, sp);
+                   fprintf (tmp, "%s: %*.*s", comp, (int)(cp - sp), (int)(cp - 
sp), sp);
            } while (*cp);
            if (cp[-1] != '\n' && cp != text)
                putc ('\n', tmp);

Index: uip/dropsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/dropsbr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- uip/dropsbr.c       16 Jan 2006 10:00:47 -0000      1.10
+++ uip/dropsbr.c       5 Apr 2008 18:41:38 -0000       1.11
@@ -2,7 +2,7 @@
 /*
  * dropsbr.c -- create/read/manipulate mail drops
  *
- * $Id: dropsbr.c,v 1.10 2006/01/16 10:00:47 opk Exp $
+ * $Id: dropsbr.c,v 1.11 2008/04/05 18:41:38 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
@@ -376,7 +376,7 @@
                            fp = strchr(ep + 1, '\n');
                        tp = dctime(dlocaltimenow());
                        snprintf (buffer, sizeof(buffer), "From %.*s  %s",
-                               fp - ep, ep, tp);
+                               (int)(fp - ep), ep, tp);
                    } else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
                        /*
                         * Change the "X-Envelope-From:" field
@@ -488,10 +488,10 @@
     if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
        dp = cp + strlen (cp);
     if (cp == file)
-       snprintf (buffer, sizeof(buffer), ".%.*s%s", dp - cp, cp, ".map");
+       snprintf (buffer, sizeof(buffer), ".%.*s%s", (int)(dp - cp), cp, 
".map");
     else
        snprintf (buffer, sizeof(buffer), "%.*s.%.*s%s",
-               cp - file, file, dp - cp, cp, ".map");
+               (int)(cp - file), file, (int)(dp - cp), cp, ".map");
 
     return buffer;
 }

Index: uip/mhbuildsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhbuildsbr.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- uip/mhbuildsbr.c    4 Nov 2007 11:54:34 -0000       1.17
+++ uip/mhbuildsbr.c    5 Apr 2008 18:41:38 -0000       1.18
@@ -2,7 +2,7 @@
 /*
  * mhbuildsbr.c -- routines to expand/translate MIME composition files
  *
- * $Id: mhbuildsbr.c,v 1.17 2007/11/04 11:54:34 jjr Exp $
+ * $Id: mhbuildsbr.c,v 1.18 2008/04/05 18:41:38 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
@@ -4309,7 +4309,7 @@
            while (*cp)
                cp++;
            fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
-                    cp - bp);
+                    (int)(cp - bp));
        }
 
        return NOTOK;

Index: uip/mhparse.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/mhparse.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- uip/mhparse.c       4 Nov 2007 11:54:35 -0000       1.17
+++ uip/mhparse.c       5 Apr 2008 18:41:38 -0000       1.18
@@ -2,7 +2,7 @@
 /*
  * mhparse.c -- routines to parse the contents of MIME messages
  *
- * $Id: mhparse.c,v 1.17 2007/11/04 11:54:35 jjr Exp $
+ * $Id: mhparse.c,v 1.18 2008/04/05 18:41:38 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
@@ -2684,7 +2684,7 @@
            while (*cp)
                cp++;
            fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
-                    cp - bp);
+                    (int)(cp - bp));
        }
 
        return NOTOK;

Index: uip/slocal.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/slocal.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- uip/slocal.c        4 Nov 2007 11:54:36 -0000       1.25
+++ uip/slocal.c        5 Apr 2008 18:41:38 -0000       1.26
@@ -2,7 +2,7 @@
 /*
  * slocal.c -- asynchronously filter and deliver new mail
  *
- * $Id: slocal.c,v 1.25 2007/11/04 11:54:36 jjr Exp $
+ * $Id: slocal.c,v 1.26 2008/04/05 18:41:38 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
@@ -1361,11 +1361,11 @@
                    /* return path for UUCP style addressing */
                    ep = strchr(++hp, '\n');
                    snprintf (buffer, sizeof(buffer), "Return-Path: 
%.*s!%.*s\n",
-                       ep - hp, hp, cp - fp, fp);
+                       (int)(ep - hp), hp, (int)(cp - fp), fp);
                } else {
                    /* return path for standard domain addressing */
                    snprintf (buffer, sizeof(buffer), "Return-Path: %.*s\n",
-                       cp - fp, fp);
+                       (int)(cp - fp), fp);
                }
 
                /* Add Return-Path header to message */