Index: elm2.4.ME+.123b-cvs/hdrs/patchlevel.h Prereq: 1183700000 *** elm2.4.ME+.123a/hdrs/patchlevel.h 2006-08-09 19:41:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/hdrs/patchlevel.h 2006-08-09 19:08:26.000000000 +0300 *************** *** 1,12 **** ! #define PATCHLEVEL "123a (25)" /* Used by Configure: SHAREDTAG: .1.0.123 */ ! #define LAST_REPORT_TIME 1183700000 #define BUG_REPORT_ADDR "Kari Hurtta " ! #define VERS_DATE "Jul 2006" /* for elm -v option */ #define WHAT_STRING \ ! "@(#) Version 2.4(ME+), USENET supported version, released Jul 2006" /* * Local Variables: --- 1,12 ---- ! #define PATCHLEVEL "123b (25)" /* Used by Configure: SHAREDTAG: .1.0.123 */ ! #define LAST_REPORT_TIME 1186000000 #define BUG_REPORT_ADDR "Kari Hurtta " ! #define VERS_DATE "Aug 2006" /* for elm -v option */ #define WHAT_STRING \ ! "@(#) Version 2.4(ME+), USENET supported version, released Aug 2006" /* * Local Variables: Index: elm2.4.ME+.123b-cvs/README.ME+ *** elm2.4.ME+.123a/README.ME+ 2006-08-09 19:41:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/README.ME+ 2006-08-09 19:08:26.000000000 +0300 *************** *** 1,4 **** ! $Header: /home/users/hurtta/cvsroot/mail/elmme+/README.ME+,v 1.1127 2006/07/27 15:06:10 hurtta Exp $ Version Elm2.4ME+ PL0 (25) is based on version Elm2.4 PL24 ME8b+. Version Elm2.4 PL24 ME8b+ is based on version Elm2.4 PL24 ME8b. --- 1,4 ---- ! $Header: /home/users/hurtta/cvsroot/mail/elmme+/README.ME+,v 1.1133 2006/08/09 16:08:26 hurtta Exp $ Version Elm2.4ME+ PL0 (25) is based on version Elm2.4 PL24 ME8b+. Version Elm2.4 PL24 ME8b+ is based on version Elm2.4 PL24 ME8b. *************** *** 13,21 **** --- 13,51 ---- Version Elm2.4 PL24 ME8b is based on version Elm2.4 PL24. Version Elm2.4ME+ PLx (25) includes patch of version Elm2.4 PL25. + Changes of Elm 2.4ME+ PL123b (25) compared with Elm 2.4ME+ PL123a (25) + --------------------------------------------------------------------- + + [ This patch is branch from the main line. ] + + - Fixed incorrect generation of elm.mimecharsets file during + installation (elm.mimecharsets.NEW was ok). + + - Avoid error message + bin/elmregister: [trim_list] Bad command letter: s + + - Fix valgrind reported memory leak: + 77 bytes in 2 blocks are definitely lost in loss record 11 of 22 + at 0x40179FF: realloc (m_replacemalloc/vg_replace_malloc.c:306) + by 0x40E96C6: safe_realloc (safemalloc.c:64) + by 0x40DDB39: elm_vmessage (output.c:1302) + by 0x40DE1B1: elm_message (output.c:1481) + by 0x809F789: set_folder_window_title (screen.c:82) + + - Fix valgrind reported memory leak: + 57 bytes in 1 blocks are definitely lost in loss record 8 of 22 + at 0x40179FF: realloc (m_replacemalloc/vg_replace_malloc.c:306) + by 0x40E96C6: safe_realloc (safemalloc.c:64) + by 0x40FBE18: strmcat (strmcpy.c:40) + by 0x40416EC: strXcat (terminal.c:91) + by 0x4043F64: terminal_set_title (terminal.c:1624) + by 0x80B1865: set_terminal_titles (termtitle.c:59) + Changes of Elm 2.4ME+ PL123a (25) compared with Elm 2.4ME+ PL123 (25) --------------------------------------------------------------------- + [ This patch is branch from the main line. ] + - "Looking at my incoming mail I noticed that there is no space (empty line) between the end of one message and the beginning of the next message". *************** *** 32,40 **** (25) should be removed. It have little point. - elm.rc may include 'unidata = none'. Avoid failing of ! 'elmregister replay' because of chmod is failing. > Instead do chmod on elmunidata ! - Same also for 'bindata = none' (do chmod on elmunidata). Changes of Elm 2.4ME+ PL123 (25) compared with Elm 2.4ME+ PL122 (25) -------------------------------------------------------------------- --- 62,70 ---- (25) should be removed. It have little point. - elm.rc may include 'unidata = none'. Avoid failing of ! 'elmregister replay' because of chmod is failing. > Instead do chmod on elmunidata ! - Same also for 'bindata = none' (do chmod on elmbindata). Changes of Elm 2.4ME+ PL123 (25) compared with Elm 2.4ME+ PL122 (25) -------------------------------------------------------------------- Index: elm2.4.ME+.123b-cvs/doc/mime.types *** elm2.4.ME+.123a/doc/mime.types 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/doc/mime.types 2006-07-30 21:12:50.000000000 +0300 *************** *** 193,196 **** # message # Perhaps? ! # eml message/rfc822 \ No newline at end of file --- 193,196 ---- # message # Perhaps? ! # eml message/rfc822 Index: elm2.4.ME+.123b-cvs/lib/mbox/localmbx.c *** elm2.4.ME+.123a/lib/mbox/localmbx.c 2006-08-09 19:41:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/lib/mbox/localmbx.c 2006-07-28 10:40:29.000000000 +0300 *************** *** 1,7 **** ! static char rcsid[] = "@(#)$Id: localmbx.c,v 1.10 2006/07/14 10:29:04 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.10 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) * or Kari Hurtta --- 1,7 ---- ! static char rcsid[] = "@(#)$Id: localmbx.c,v 1.11 2006/07/28 07:40:29 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.11 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) * or Kari Hurtta *************** *** 5105,5111 **** folder,folder->cur_folder_sys)); if (keep) { ! int ch; fh = folder_to_fd(folder,entry->offset); if (!fh) --- 5105,5111 ---- folder,folder->cur_folder_sys)); if (keep) { ! int ch = '\0'; fh = folder_to_fd(folder,entry->offset); if (!fh) Index: elm2.4.ME+.123b-cvs/lib/mbox/savefolder.c *** elm2.4.ME+.123a/lib/mbox/savefolder.c 2006-08-09 19:41:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/lib/mbox/savefolder.c 2006-08-09 19:12:28.000000000 +0300 *************** *** 1,9 **** ! static char rcsid[] = "@(#)$Id: savefolder.c,v 1.9 2006/07/14 10:29:04 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.9 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) ***************************************************************************** * Some local mailbox code based on ../src/file.c. * That code was following copyright: --- 1,10 ---- ! static char rcsid[] = "@(#)$Id: savefolder.c,v 1.11 2006/08/09 16:12:28 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.11 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) + * or Kari Hurtta ***************************************************************************** * Some local mailbox code based on ../src/file.c. * That code was following copyright: *************** *** 101,107 **** &X,&se,&rest, STFLAG_is_imap /* Need IMAP */ ))) { ! static struct connection_cache *CX; PORTS ports_imaponly[] = { PORT_imap4, PORT_end }; int got; --- 102,108 ---- &X,&se,&rest, STFLAG_is_imap /* Need IMAP */ ))) { ! struct connection_cache *CX; PORTS ports_imaponly[] = { PORT_imap4, PORT_end }; int got; Index: elm2.4.ME+.123b-cvs/lib/misc/charset.c *** elm2.4.ME+.123a/lib/misc/charset.c 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/lib/misc/charset.c 2006-08-02 11:46:02.000000000 +0300 *************** *** 1,7 **** ! static char rcsid[] = "@(#)$Id: charset.c,v 1.4 2006/04/09 07:37:36 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.4 $ $State: Exp $ * * Author: Kari Hurtta * or Kari Hurtta --- 1,7 ---- ! static char rcsid[] = "@(#)$Id: charset.c,v 1.5 2006/08/02 08:46:02 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.5 $ $State: Exp $ * * Author: Kari Hurtta * or Kari Hurtta *************** *** 137,143 **** for (ptr = map; ptr && ptr->charset; ptr++) { if (!ptr->match && ! 0 != (ptr->charset->flags & SET_printed)) continue; /* Several aliases lines? */ if (!ptr->match && 0 == (ptr->charset->flags & SET_valid)) { --- 137,144 ---- for (ptr = map; ptr && ptr->charset; ptr++) { if (!ptr->match && ! 0 != (ptr->charset->flags & SET_printed) && ! 2 == ptr->is_def) continue; /* Several aliases lines? */ if (!ptr->match && 0 == (ptr->charset->flags & SET_valid)) { *************** *** 151,157 **** fputc('\t',f); ! if (0 != (ptr->charset->flags & SET_printed)) { /* Several aliases lines? */ goto noalias; } --- 152,159 ---- fputc('\t',f); ! if (0 != (ptr->charset->flags & SET_printed) && ! 2 == ptr->is_def) { /* Several aliases lines? */ goto noalias; } Index: elm2.4.ME+.123b-cvs/src/screen.c *** elm2.4.ME+.123a/src/screen.c 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/src/screen.c 2006-08-09 19:16:37.000000000 +0300 *************** *** 1,10 **** ! static char rcsid[] = "@(#)$Id: screen.c,v 1.46 2006/04/09 07:37:19 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.46 $ $State: Exp $ * * Modified by: Kari Hurtta ! * (was hurtta+elm@ozone.FMI.FI) ****************************************************************************** * The Elm Mail System * --- 1,11 ---- ! static char rcsid[] = "@(#)$Id: screen.c,v 1.48 2006/08/09 16:16:37 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.48 $ $State: Exp $ * * Modified by: Kari Hurtta ! * (was hurtta+elm@ozone.FMI.FI) ! * or Kari Hurtta ****************************************************************************** * The Elm Mail System * *************** *** 88,95 **** set_terminal_titles(title_s ? title_s : title_3, icon_s ? icon_s : icon); ! free(title_3); free_string(&title_2); free_string(&title_1); } --- 89,97 ---- set_terminal_titles(title_s ? title_s : title_3, icon_s ? icon_s : icon); ! free(title_3); + free(icon); free_string(&title_2); free_string(&title_1); } Index: elm2.4.ME+.123b-cvs/src/screen/termtitle.c *** elm2.4.ME+.123a/src/screen/termtitle.c 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/src/screen/termtitle.c 2006-08-09 19:18:44.000000000 +0300 *************** *** 1,9 **** ! static char rcsid[] = "@(#)$Id: termtitle.c,v 1.5 2006/04/09 07:37:37 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.5 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) *****************************************************************************/ #include "def_screen.h" --- 1,10 ---- ! static char rcsid[] = "@(#)$Id: termtitle.c,v 1.7 2006/08/09 16:18:44 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.7 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) + * or Kari Hurtta *****************************************************************************/ #include "def_screen.h" *************** *** 82,87 **** --- 83,89 ---- outchar(str[i]); } + free(str); } if (title) Index: elm2.4.ME+.123b-cvs/utils/elmregister.c *** elm2.4.ME+.123a/utils/elmregister.c 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123b-cvs/utils/elmregister.c 2006-08-03 08:25:49.000000000 +0300 *************** *** 1,7 **** ! static char rcsid[] = "@(#)$Id: elmregister.c,v 1.32 2006/04/09 07:37:30 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.32 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) *****************************************************************************/ --- 1,7 ---- ! static char rcsid[] = "@(#)$Id: elmregister.c,v 1.33 2006/08/03 05:25:49 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.33 $ $State: Exp $ * * Author: Kari Hurtta (was hurtta+elm@ozone.FMI.FI) *****************************************************************************/ *************** *** 3163,3169 **** switch (ptr->command_letter) { case '\0': /* ENTRY DELETED */ ! break; case 'L': --- 3163,3169 ---- switch (ptr->command_letter) { case '\0': /* ENTRY DELETED */ ! break; case 'L': *************** *** 3172,3189 **** if (ptr->arg_ptrs && ptr->arg_ptrs[1]) { if (!on_current(source,ptr->arg_ptrs[1])) { ! if ('M' != ptr->command_letter) ! fprintf(stdout, ! "%s: (%s) Keeping link %s from old version (was %s)\n", ! program_name,source->filename,ptr->arg_ptrs[1], ! ptr->arg_ptrs[0] ! ); continue; } } goto trim; case 'M': case '{': case 'F': --- 3172,3202 ---- if (ptr->arg_ptrs && ptr->arg_ptrs[1]) { if (!on_current(source,ptr->arg_ptrs[1])) { ! fprintf(stdout, ! "%s: (%s) Keeping link %s from old version (was %s)\n", ! program_name,source->filename,ptr->arg_ptrs[1], ! ptr->arg_ptrs[0] ! ); continue; } } goto trim; + + case 's': + + if (ptr->arg_ptrs && ptr->arg_ptrs[0]) { + + if (!on_current(source,ptr->arg_ptrs[0])) { + fprintf(stdout, + "%s: (%s) Stage file %s from old version found -- incomplete install?\n", + program_name,source->filename,ptr->arg_ptrs[0]); + continue; + } + } + goto trim; + case 'M': case '{': case 'F': *************** *** 3195,3201 **** if (!on_current(source,ptr->arg_ptrs[0])) { if ('M' != ptr->command_letter) fprintf(stdout, ! "%s: (%s) Keeping file %s is from old version\n", program_name,source->filename,ptr->arg_ptrs[0]); continue; } --- 3208,3214 ---- if (!on_current(source,ptr->arg_ptrs[0])) { if ('M' != ptr->command_letter) fprintf(stdout, ! "%s: (%s) Keeping file %s from old version\n", program_name,source->filename,ptr->arg_ptrs[0]); continue; }