Index: elm2.4.ME+.123c-cvs/hdrs/patchlevel.h Prereq: 1186000000 *** elm2.4.ME+.123b/hdrs/patchlevel.h 2006-08-27 15:21:43.000000000 +0300 --- elm2.4.ME+.123c-cvs/hdrs/patchlevel.h 2006-08-27 15:18:50.000000000 +0300 *************** *** 1,8 **** ! #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 \ --- 1,8 ---- ! #define PATCHLEVEL "123c (25)" /* Used by Configure: SHAREDTAG: .1.0.123 */ ! #define LAST_REPORT_TIME 1188000000 #define BUG_REPORT_ADDR "Kari Hurtta " #define VERS_DATE "Aug 2006" /* for elm -v option */ #define WHAT_STRING \ Index: elm2.4.ME+.123c-cvs/README.ME+ *** elm2.4.ME+.123b/README.ME+ 2006-08-27 15:21:44.000000000 +0300 --- elm2.4.ME+.123c-cvs/README.ME+ 2006-08-27 15:18:50.000000000 +0300 *************** *** 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. --- 1,4 ---- ! $Header: /home/users/hurtta/cvsroot/mail/elmme+/README.ME+,v 1.1137 2006/08/27 12:18:50 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,20 **** 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. ] --- 13,37 ---- 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+ PL123c (25) compared with Elm 2.4ME+ PL123b (25) + ---------------------------------------------------------------------- + + [ This patch is branch from the main line. ] + + - Fixed crash when om elmrc have + ### pgp2 = none + + "Is that "&&" correct? Looking at other "none" comparisons + in the file, it isn't. Patch attached, and problem + confirmed fixed." + From: Bruce Momjian + + - Option -w did not rebuild .elm/mime.types although error + message asked to use -w option. + - Error message did not mentioned .elm/mime.types. Added it. + Changes of Elm 2.4ME+ PL123b (25) compared with Elm 2.4ME+ PL123a (25) ! ---------------------------------------------------------------------- [ This patch is branch from the main line. ] *************** *** 1994,2000 **** - utils/answer.c included some bogus aliases reading routines. Replaced it fetch_alias(). It still is broken, but that is little better... ! Problem noted by: From: Mikhail T. New elmrc options: mime-parameters --- 2011,2017 ---- - utils/answer.c included some bogus aliases reading routines. Replaced it fetch_alias(). It still is broken, but that is little better... ! Problem noted by: Mikhail T. New elmrc options: mime-parameters *************** *** 3655,3661 **** to the next matched line, but the surrounding lines are from the original match hit (the screen is not being updated)." ( about / -command) ! Problem noted by: From: Bruce Momjian - "The pgp message "[End of raw data]" is confused as a file inclusion when it appears in a reply. --- 3672,3678 ---- to the next matched line, but the surrounding lines are from the original match hit (the screen is not being updated)." ( about / -command) ! Problem noted by: Bruce Momjian - "The pgp message "[End of raw data]" is confused as a file inclusion when it appears in a reply. *************** *** 3741,3747 **** to the next matched line, but the surrounding lines are from the original match hit (the screen is not being updated)." ( about / -command) ! Problem noted by: From: Bruce Momjian - "The pgp message "[End of raw data]" is confused as a file inclusion when it appears in a reply. --- 3758,3764 ---- to the next matched line, but the surrounding lines are from the original match hit (the screen is not being updated)." ( about / -command) ! Problem noted by: Bruce Momjian - "The pgp message "[End of raw data]" is confused as a file inclusion when it appears in a reply. Index: elm2.4.ME+.123c-cvs/hdrs/s_elm.h *** elm2.4.ME+.123b/hdrs/s_elm.h 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123c-cvs/hdrs/s_elm.h 2006-08-26 17:52:02.000000000 +0300 *************** *** 1186,1188 **** --- 1186,1189 ---- #define ElmLevel1VisitMLine3 0x8cc #define ElmArgsConfirmUrlNeedsO 0x8cd #define ElmConfirmUrlBatch 0x8ce + #define ElmContentTypeInfoSavedIn 0x8cf Index: elm2.4.ME+.123c-cvs/Makefile.SH *** elm2.4.ME+.123b/Makefile.SH 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123c-cvs/Makefile.SH 2006-08-25 18:47:37.000000000 +0300 *************** *** 23,29 **** echo "Extracting Makefile (with variable substitutions)" cat >Makefile <Makefile <>Makefile <>Makefile <<'!NO!SUBS!' ! cd lib; $(MAKE) $(MJ) $(MFLAGS) install_s ! cd melib; $(MAKE) $(MJ) $(MFLAGS) install_s cd shared_libs; $(MAKE) $(MJ) $(MFLAGS) install_s # Targets that are simply executed in each subordinate makefile as is Index: elm2.4.ME+.123c-cvs/melib/pgp_decode.c *** elm2.4.ME+.123b/melib/pgp_decode.c 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123c-cvs/melib/pgp_decode.c 2006-08-23 19:08:48.000000000 +0300 *************** *** 1,7 **** ! static char rcsid[] = "@(#)$Id: pgp_decode.c,v 1.49 2006/05/07 08:35:31 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.49 $ $State: Exp $ * * Modified by: Kari Hurtta * (was hurtta+elm@ozone.FMI.FI) --- 1,7 ---- ! static char rcsid[] = "@(#)$Id: pgp_decode.c,v 1.50 2006/08/23 16:08:48 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.50 $ $State: Exp $ * * Modified by: Kari Hurtta * (was hurtta+elm@ozone.FMI.FI) *************** *** 48,54 **** case pgp2: { char * pgp2_path_val = give_dt_estr_as_str(&pgp2_path_e, "pgp2"); ! if (! pgp2_path_val && strcmp(pgp2_path_val,"none") == 0 || pgp2_path_val[0] == '\0') { return_value = pgp_none; --- 48,54 ---- case pgp2: { char * pgp2_path_val = give_dt_estr_as_str(&pgp2_path_e, "pgp2"); ! if (! pgp2_path_val || strcmp(pgp2_path_val,"none") == 0 || pgp2_path_val[0] == '\0') { return_value = pgp_none; Index: elm2.4.ME+.123c-cvs/nls/C/C/C/s_elm.m *** elm2.4.ME+.123b/nls/C/C/C/s_elm.m 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123c-cvs/nls/C/C/C/s_elm.m 2006-08-26 17:52:02.000000000 +0300 *************** *** 1999,2005 **** $ #CharsetsSavedIn 2012 Charsets saved in file %s. $ #FixElmrc ! 2013 Fix %s, %s, %s, %s and/or %s or let elm rebuild them with option '-w'. $ #PassphraseForget 2014 Forget passphrase $ #ViewParts --- 1999,2005 ---- $ #CharsetsSavedIn 2012 Charsets saved in file %s. $ #FixElmrc ! 2013 Fix %s, %s, %s, %s, %s and/or %s or let elm rebuild them with option '-w'. $ #PassphraseForget 2014 Forget passphrase $ #ViewParts *************** *** 2489,2491 **** --- 2489,2493 ---- 2253 "--confirm_url requires that url is given with -O argument" $ #ConfirmUrlBatch 2254 "Can't confirm url on batch mode." + $ #ContentTypeInfoSavedIn + 2255 "Content-type mapping info saved in file %s." Index: elm2.4.ME+.123c-cvs/src/init.c *** elm2.4.ME+.123b/src/init.c 2006-07-05 20:21:50.000000000 +0300 --- elm2.4.ME+.123c-cvs/src/init.c 2006-08-26 17:52:02.000000000 +0300 *************** *** 1,7 **** ! static char rcsid[] = "@(#)$Id: init.c,v 1.72 2006/07/01 08:40:52 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.72 $ $State: Exp $ * * Modified by: Kari Hurtta * (was hurtta+elm@ozone.FMI.FI) --- 1,7 ---- ! static char rcsid[] = "@(#)$Id: init.c,v 1.73 2006/08/26 14:52:02 hurtta Exp $"; /****************************************************************************** ! * The Elm (ME+) Mail System - $Revision: 1.73 $ $State: Exp $ * * Modified by: Kari Hurtta * (was hurtta+elm@ozone.FMI.FI) *************** *** 287,296 **** if (!batch_only && !write_elmrc) { lib_error(CATGETS(elm_msg_cat, ElmSet, ElmFixElmrc, ! "Fix %s, %s, %s, %s and/or %s or let elm rebuild them with option '-w'."), ELMRCFILE, USER_MIME_CHARSETS, USER_TERMINAL_INFO, USER_MAIL_SERVICES, ! USER_ISO2022_SETS ); error_wait(); /* Be sure that we do not exit before error is shown */ --- 287,296 ---- if (!batch_only && !write_elmrc) { lib_error(CATGETS(elm_msg_cat, ElmSet, ElmFixElmrc, ! "Fix %s, %s, %s, %s, %s and/or %s or let elm rebuild them with option '-w'."), ELMRCFILE, USER_MIME_CHARSETS, USER_TERMINAL_INFO, USER_MAIL_SERVICES, ! USER_ISO2022_SETS, USER_MIME_TYPES ); error_wait(); /* Be sure that we do not exit before error is shown */ *************** *** 355,362 **** "ISO 2022 mappings saved in file %s."), user_iso2022_sets); } - free(tmp); } tmp = elm_message(FRM("%s.N"),user_mime_charsets); --- 355,362 ---- "ISO 2022 mappings saved in file %s."), user_iso2022_sets); } } + free(tmp); tmp = elm_message(FRM("%s.N"),user_mime_charsets); *************** *** 391,398 **** "Charsets saved in file %s."), user_mime_charsets); } - free(tmp); } tmp = elm_message(FRM("%s.N"),user_terminal_info); err = can_open(tmp,"w"); --- 391,398 ---- "Charsets saved in file %s."), user_mime_charsets); } } + free(tmp); tmp = elm_message(FRM("%s.N"),user_terminal_info); err = can_open(tmp,"w"); *************** *** 426,433 **** "Additional terminal info saved in file %s."), user_terminal_info); } - free(tmp); } #ifdef REMOTE_MBX tmp = elm_message(FRM("%s.N"),user_mail_services); --- 426,433 ---- "Additional terminal info saved in file %s."), user_terminal_info); } } + free(tmp); #ifdef REMOTE_MBX tmp = elm_message(FRM("%s.N"),user_mail_services); *************** *** 462,471 **** "Mail service info saved in file %s."), user_mail_services); } - free(tmp); } #endif error_sleep(1); } --- 462,509 ---- "Mail service info saved in file %s."), user_mail_services); } } + free(tmp); #endif + tmp = elm_message(FRM("%s.N"),user_mime_types); + err = can_open(tmp,"w"); + if (err) + lib_error(CATGETS(elm_msg_cat, MeSet, MeFileNotWriteable, + "File %.50s is not writeable: %s"), + tmp, error_description(err)); + else if (!(f = fopen(tmp,"w"))) { + int err = errno; + lib_error(CATGETS(elm_msg_cat, MeSet, MeFileNotWriteable, + "File %.50s is not writeable: %s"), + tmp, error_description(err)); + } else { + dump_mime_types_map(f,user_mimetypes_map); + if (EOF == fclose(f)) { + int err = errno; + lib_error(CATGETS(elm_msg_cat, MeSet, MeFileNotWriteable, + "File %.50s is not writeable: %s"), + tmp, error_description(err)); + + } else if (0 != rename(tmp,user_mime_types)) { + int err = errno; + lib_error(CATGETS(elm_msg_cat, MeSet, MeFileNotRenamed, + "Failed to rename temporary file to %.50s: %30s"), + user_terminal_info, + error_description(err)); + + } else { + lib_error(CATGETS(elm_msg_cat, ElmSet, + ElmContentTypeInfoSavedIn, + "Content-type mapping info saved in file %s."), + user_mime_types); + } + } + free(tmp); + + + + error_sleep(1); }